[Bf-blender-cvs] [29fa45b695b] blender2.8: Correct merge conflict

[Campbell Barton]

Commit: 29fa45b695b3d851a33e76ff5904150f63c231b9
Author: Campbell Barton
Date:   Tue Sep 11 17:47:30 2018 +1000
Branches: blender2.8
https://developer.blender.org/rB29fa45b695b3d851a33e76ff5904150f63c231b9

Correct merge conflict

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

M	release/scripts/startup/bl_ui/properties_grease_pencil_common.py

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

diff --git a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
index 415f8a5fd8d..71688fc7c65 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -404,13 +404,8 @@ class GPENCIL_MT_pie_settings_palette(Menu):
         pie = layout.menu_pie()
         gpd = context.gpencil_data
         gpl = context.active_gpencil_layer
-<<<<<<< HEAD
         palcolor = None  # context.active_gpencil_palettecolor
-        brush = context.active_gpencil_brush
-=======
-        palcolor = context.active_gpencil_palettecolor
         # brush = context.active_gpencil_brush
->>>>>>> master
 
         is_editmode = bool(gpd and gpd.use_stroke_edit_mode and context.editable_gpencil_strokes)