Fix conflict

MrKepzie · Oct 23, 2015 · dc93796 · dc93796
1 parent a3c3f30
commit dc93796
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/Global/Macros.h b/Global/Macros.h
@@ -86,12 +86,7 @@
 #define NATRON_VERSION_MINOR 0
 #define NATRON_VERSION_REVISION 0
 
-<<<<<<< HEAD
-///For example RC 1, RC 2 etc...
-#define NATRON_BUILD_NUMBER 1
 
-=======
->>>>>>> workshop
 #define NATRON_LAST_VERSION_URL "https://raw.githubusercontent.com/MrKepzie/Natron/workshop/LATEST_VERSION.txt"
 #define NATRON_LAST_VERSION_FILE_VERSION 1