UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflicts

Browse Source
This commit is contained in:
Quentin Guidée
2020-02-23 13:45:07 +01:00
parent 836b23b06c 1a77250624
commit 074afa2fef
23 changed files with 114 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/settings/main_controller_prompt_beta.cpp
View File

@@ -2,6 +2,8 @@
#include "../exam_mode_configuration.h"
#include <apps/i18n.h>
using namespace Shared;
namespace Settings {
constexpr SettingsMessageTree s_modelMenu[] =