1 files changed, 6 insertions, 0 deletions
diff --git a/source/Concept/Framework/defines.h b/source/Concept/Framework/defines.h
index 1cec0f3..6a88917 100644
--- a/source/Concept/Framework/defines.h
+++ b/source/Concept/Framework/defines.h
@@ -58,8 +58,14 @@
 //Constants
 #define SPEED_PER_PWM 1
 #define DISTANCE_PER_VALUE 1
+<<<<<<< .mine
 #define PI 3.14159265358979323846f
 #define CYCLES_PER_CORRECTION 200
+#define EMPTY_FLOAT 81188.1484f
+=======
+#define PI 3.14159265358979323846f
+#define CYCLES_PER_CORRECTION 200
+>>>>>>> .r199
 
 #define EMPTY_FLOAT 81188.1484f