[Bf-blender-cvs] [ca7fd606dae] greasepencil-object: GP: Merge errors

[Charlie Jolly]

Commit: ca7fd606dae1260f6764adbb2f7b0ec02bdb1f70
Author: Charlie Jolly
Date:   Tue Dec 11 15:47:32 2018 +0000
Branches: greasepencil-object
https://developer.blender.org/rBca7fd606dae1260f6764adbb2f7b0ec02bdb1f70

GP: Merge errors

===================================================================

M	source/blender/editors/gpencil/gpencil_primitive.c

===================================================================

diff --git a/source/blender/editors/gpencil/gpencil_primitive.c b/source/blender/editors/gpencil/gpencil_primitive.c
index 19091242b50..56ed792b9b9 100644
--- a/source/blender/editors/gpencil/gpencil_primitive.c
+++ b/source/blender/editors/gpencil/gpencil_primitive.c
@@ -102,16 +102,10 @@
 #define SELECT_CP2 3
 #define SELECT_END 4
 
-<<<<<<< HEAD
 #define BIG_SIZE_CTL    15
 #define MID_SIZE_CTL    10
 #define SMALL_SIZE_CTL   8 
 
-=======
-#define BIG_SIZE_CTL    10
-#define MID_SIZE_CTL    15
-#define SMALL_SIZE_CTL  20 
->>>>>>> GP: Primitive, add noise to box and circle
   /* ************************************************ */
   /* Core/Shared Utilities */