Correct error in last commit
authorCampbell Barton <ideasman42@gmail.com>
Sat, 20 Apr 2019 18:58:52 +0000 (04:58 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 20 Apr 2019 18:58:52 +0000 (04:58 +1000)
release/scripts/startup/bl_ui/space_text.py

index 0b83aca..6956a83 100644 (file)
@@ -36,9 +36,9 @@ class TEXT_HT_header(Header):
         TEXT_MT_editor_menus.draw_collapsible(context, layout)
 
         if text and text.is_modified:
         TEXT_MT_editor_menus.draw_collapsible(context, layout)
 
         if text and text.is_modified:
-            sub = row.row(align=True)
-            sub.alert = True
-            sub.operator("text.resolve_conflict", text="", icon='HELP')
+            row = layout.row(align=True)
+            row.alert = True
+            row.operator("text.resolve_conflict", text="", icon='HELP')
 
         layout.separator_spacer()
 
 
         layout.separator_spacer()