Merge branch 'develop' into disable_notif_only

2021-09-14 23:38:42 +03:00
parent 40765f1173 3eb73774a3
commit 93d240a23b
8 changed files with 121 additions and 69 deletions
--- a/src/components/motor/MotorController.h
+++ b/src/components/motor/MotorController.h
@@ -1,7 +1,6 @@
 #pragma once

 #include <cstdint>
-#include "app_timer.h"

 namespace Pinetime {
  namespace Controllers {