Fix conflicts

2026-01-19 00:37:25 +01:00 · 2020-02-23 13:27:10 +01:00
parent 5420a8a34f c8537df3b4
commit 24907511f5
23 changed files with 114 additions and 65 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 {