diff options
Diffstat (limited to 'source/blender/blenkernel/BKE_blender.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_blender.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/source/blender/blenkernel/BKE_blender.h b/source/blender/blenkernel/BKE_blender.h index 245d61f3f7e..472aa4eb834 100644 --- a/source/blender/blenkernel/BKE_blender.h +++ b/source/blender/blenkernel/BKE_blender.h @@ -44,13 +44,8 @@ struct ListBase; struct MemFile; struct bContext; -<<<<<<< .mine #define BLENDER_VERSION 250 #define BLENDER_SUBVERSION 0 -======= -#define BLENDER_VERSION 245 -#define BLENDER_SUBVERSION 12 ->>>>>>> .r12991 #define BLENDER_MINVERSION 250 #define BLENDER_MINSUBVERSION 0 |