Committing dev changes

Author: Main Push Robot

src/Hall-Effect-SOLDERED.h

@@ -20,13 +20,8 @@
 #include "Arduino.h"
 #include "Hall-Effect-Analog-SOLDERED.h"
 #include "Hall-Effect-Analog-easyC-SOLDERED.h"
-<<<<<<< Updated upstream
 #include "Hall-Effect-Digital-SOLDERED.h"
 #include "Hall-Effect-Digital-easyC-SOLDERED.h"
-=======
-#include "Hall-Effect-Digital-SOLDERED.h"
-#include "Hall-Effect-Digital-easyC-SOLDERED.h"
->>>>>>> Stashed changes
-    #include "libs/Generic-easyC/easyC.hpp"
+#include "libs/Generic-easyC/easyC.hpp"
 
 #endif