fabian/pitrix
1
0
Fork 0
Code Issues 8 Releases Activity

Remove left-over merge stuff in efects/big_clock.h
Some checks reported errors
continuous-integration/drone Build was killed
Details

Browse Source
This commit is contained in:
Fabian Schlenz 2020-11-06 23:42:04 +01:00
parent c9825c8f9b
commit d76e088c37
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/effects/big_clock.h
View File

@ -18,13 +18,4 @@ protected:
public:
virtual void loop(uint16_t ms);
String get_name() override { return "big_clock"; }
};
<<<<<<< HEAD:include/effects/big_clock.h
=======
class NightClockEffect : public BigClockEffect {
private:
void _draw_border_pixel(accum88 pos, CRGB* color) { };
CRGB _get_color_font() { return CRGB(0x220000); }
};
>>>>>>> ecf5998510bf1f8230d070cebccb4c89f95ce856:include/effect_big_clock.h
};