Fixed bad merge

0xa10 · Jul 18, 2020 · 41ebb83 · 41ebb83
1 parent 356bc40
commit 41ebb83
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/gt521f32_viewer/viewer.py b/gt521f32_viewer/viewer.py
@@ -57,11 +57,7 @@ def start(self):
         self._root.after(1_000 // GT521F32Viewer._FRAME_RATE, self._video_loop)
         self._root.mainloop()
 
-<<<<<<< HEAD
     def _update(self, image: PIL.Image.Image):
-=======
-    def _update(self, image: PIL.ImageTk.PhotoImage):
->>>>>>> 75f40204c7795d54d62b0e855a0563505a78f098
         if self._scale_factor != 1:
             image = image.resize(
                 (