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 main_controller

Browse Source
This commit is contained in:
BuildTools
2019-11-10 10:43:30 -05:00
parent 21de90d388
commit d4ac3e9fc9
5 changed files with 6 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/settings/main_controller.h
View File

@@ -9,11 +9,7 @@
#include "sub_menu/exam_mode_controller.h"
#include "sub_menu/language_controller.h"
#include "sub_menu/preferences_controller.h"
<<<<<<< HEAD
#include "sub_menu/contributors_controller.h"
#include "sub_menu/symbol_controller.h"
=======
>>>>>>> 875276e017e7c07d03458029a1b7a8f16747ac11
namespace Settings {
@@ -48,11 +44,7 @@ private:
AccessibilityController m_accessibilityController;
ExamModeController m_examModeController;
AboutController m_aboutController;
<<<<<<< HEAD
ContributorsController m_contributorsController;
SymbolController m_symbolController;
=======
>>>>>>> 875276e017e7c07d03458029a1b7a8f16747ac11
};
}