Fix conflicts

This commit is contained in:
Quentin Guidée
2020-02-23 13:27:10 +01:00
23 changed files with 114 additions and 65 deletions

View File

@@ -4,6 +4,8 @@
namespace Settings {
using namespace Shared;
constexpr SettingsMessageTree s_modelMenu[] =
{SettingsMessageTree(I18n::Message::MathOptions, s_modelMathOptionsChildren),
SettingsMessageTree(I18n::Message::Brightness),