Correct merge conflict

2018-09-11 17:47:30 +10:00
parent 01e6f09001
commit 29fa45b695
1 changed files with 0 additions and 5 deletions
--- 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)