tkgui/FX3.py

@@ -258,12 +258,7 @@ class Gui(): # DUMMY
 manager = MANAGER() 
 modes = Modes()
 gui  = Gui()
-<<<<<<< HEAD
-=======
- 
 
-
->>>>>>> a411153 (test: commit branch:dev)
 root = tk.Tk()
 root.maxsize(600,800)