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.
* Extended ASCII codes and cyrillic support
(cherry picked from commit e977840805d3d14260f917b03a2db957d52ec657)
* Fixed `ё`, `Ё` letters
(cherry picked from commit 2f4a2ccb2f50cab879f4a1002215c176a435bae7)
* Fixed `customFontTableLookup` execution flow
(cherry picked from commit 377f909f36201ba6f7fe4511f631f54b8cb2ab3e)
* [OLED] Specifying the language by defining it in `platformio.ini`
(cherry picked from commit ddd8132b24095556e0b3cd17f1a3b3458bc15c4e)
* [OLED] localization guide
(cherry picked from commit a3267c886f36731c8f123636162a8c2a752a80c4)
* [OLED] Cyrillic support
Localization guide has been moved to https://github.com/meshtastic/Meshtastic/tree/master/docs/developers/Firmwarehttps://meshtastic.org/docs/developers/Firmware/oled-l10n-guide
Co-authored-by: Thomas Göttgens <tgoettgens@gmail.com>
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
