Fix conflicts

2026-01-19 00:37:25 +01:00 · 2020-02-23 13:45:07 +01:00
parent 836b23b06c 1a77250624
commit 074afa2fef
23 changed files with 114 additions and 66 deletions
--- a/apps/settings/main_controller.cpp
+++ b/apps/settings/main_controller.cpp
@@ -5,6 +5,7 @@
 #include <ion/backlight.h>

 using namespace Poincare;
+using namespace Shared;

 namespace Settings {