Commit 30fdbdc3 authored by Kai Willadsen's avatar Kai Willadsen

PEP8 fixes for filemerge

parent 3d0ba743
......@@ -18,8 +18,6 @@
from gettext import gettext as _
import gtk
from . import filediff
from . import meldbuffer
from . import merge
......@@ -61,4 +59,3 @@ class FileMerge(filediff.FileDiff):
self.textbuffer[1].set_text(merged_text)
self.textbuffer[1].data.modified = True
self.recompute_label()
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment