mirror of
https://github.com/meshtastic/firmware.git
synced 2026-01-31 22:21:51 +00:00
I thought git would be smart enough to understand all the whitespace changes but even with all the flags I know to make it ignore theses it still blows up if there are identical changes on both sides.
I have a solution but it require creating a new commit at the merge base for each conflicting PR and merging it into develop.
I don't think blowing up all PRs is worth for now, maybe if we can coordinate this for V3 let's say.
This reverts commit 0d11331d18.
13 lines
279 B
C++
13 lines
279 B
C++
#ifdef MESHTASTIC_INCLUDE_INKHUD
|
|
|
|
#include "./PlaceholderApplet.h"
|
|
|
|
using namespace NicheGraphics;
|
|
|
|
void InkHUD::PlaceholderApplet::onRender()
|
|
{
|
|
// This placeholder applet fills its area with sparse diagonal lines
|
|
hatchRegion(0, 0, width(), height(), 8, BLACK);
|
|
}
|
|
|
|
#endif |