Fix more merge stupid leftover, and some build warnings.

2018-08-01 14:29:36 +02:00
parent ef8ab3b4c2
commit 9a43ebdd5b
2 changed files with 4 additions and 4 deletions
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -1615,7 +1615,6 @@ class VIEW3D_PT_tools_grease_pencil_brushcurves(View3DPanel, Panel):

 # Grease Pencil create shapes
 class VIEW3D_PT_tools_grease_pencil_shapes(View3DPanel, Panel):
->>>>>>> blender2.8
    bl_space_type = 'VIEW_3D'
    bl_region_type = 'HEADER'
    bl_label = "Shapes"