mirror of
https://github.com/meshtastic/firmware.git
synced 2026-01-17 07:17:32 +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.
This commit is contained in:
@@ -2,18 +2,30 @@
|
||||
|
||||
#if (HAS_WIFI == 0)
|
||||
|
||||
bool initWifi() { return false; }
|
||||
bool initWifi()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
void deinitWifi() {}
|
||||
|
||||
bool isWifiAvailable() { return false; }
|
||||
bool isWifiAvailable()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
#if (HAS_ETHERNET == 0)
|
||||
|
||||
bool initEthernet() { return false; }
|
||||
bool initEthernet()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
bool isEthernetAvailable() { return false; }
|
||||
bool isEthernetAvailable()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user