fix conflicts

dimitre · dimitre · commit cf4244982ee9 · 2025-11-17T09:59:27.000-03:00
diff --git a/libs/openFrameworks/utils/ofConstants.h b/libs/openFrameworks/utils/ofConstants.h
@@ -2,15 +2,9 @@
 
 // version: ------------------------
 #define OF_VERSION_MAJOR 0
-<<<<<<< HEAD
-#define OF_VERSION_MINOR 13
-#define OF_VERSION_PATCH 0
-#define OF_VERSION_PRE_RELEASE "master"
-=======
 #define OF_VERSION_MINOR 12
 #define OF_VERSION_PATCH 1
 #define OF_VERSION_PRE_RELEASE ""
->>>>>>> master
 
 // core: ---------------------------
 #include <stdint.h>
