mirror of
https://github.com/meshtastic/firmware.git
synced 2026-01-16 06:47:52 +00:00
beb268ff25
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.
11 lines
336 B
C++
11 lines
336 B
C++
#pragma once
|
|
#include "NodeDB.h"
|
|
|
|
class DisplayFormatters
|
|
{
|
|
public:
|
|
static const char *getModemPresetDisplayName(meshtastic_Config_LoRaConfig_ModemPreset preset, bool useShortName,
|
|
bool usePreset);
|
|
static const char *getDeviceRole(meshtastic_Config_DeviceConfig_Role role);
|
|
};
|