From 4cbcc99c8dfbd27bf3c87ef1c2b13af871a9c269 Mon Sep 17 00:00:00 2001
From: jlukanc <27705324+jlukanc1@users.noreply.github.com>
Date: Sat, 23 Jan 2021 16:12:06 -0500
Subject: [PATCH] fis merge conflict?

---
 src/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3fe5d50a..0ed2562f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -457,7 +457,6 @@ set(INCLUDE_FILES
         components/ble/ImmediateAlertService.h
         components/ble/ServiceDiscovery.h
         components/ble/BleClient.h
-        components/motor/MotorController.h
         drivers/Cst816s.h
         FreeRTOS/portmacro.h
         FreeRTOS/portmacro_cmsis.h
@@ -474,6 +473,7 @@ set(INCLUDE_FILES
         systemtask/SystemMonitor.h
         displayapp/screens/Symbols.h
         drivers/TwiMaster.h
+        components/motor/MotorController.h
         )
 
 include_directories(