Manually moving from Dev Latest on PC

PySimpleGUI.py

@@ -867,10 +867,6 @@ class FlexForm:
     '''
     Display a user defined for and return the filled in data
     '''
-<<<<<<< HEAD
-=======
-
->>>>>>> 531b32ab66746c9f4b6acd2ea8b6d113cb235827
     def __init__(self, title, default_element_size=(DEFAULT_ELEMENT_SIZE[0], DEFAULT_ELEMENT_SIZE[1]), auto_size_text=None, auto_size_buttons=None, scale=(None, None), location=(None, None), button_color=None, font=None, progress_bar_color=(None, None), background_color=None, is_tabbed_form=False, border_depth=None, auto_close=False, auto_close_duration=DEFAULT_AUTOCLOSE_TIME, icon=DEFAULT_WINDOW_ICON, return_keyboard_events=False, use_default_focus=True, text_justification=None):
         self.AutoSizeText = auto_size_text if auto_size_text is not None else DEFAULT_AUTOSIZE_TEXT
         self.AutoSizeButtons = auto_size_buttons if auto_size_buttons is not None else DEFAULT_AUTOSIZE_BUTTONS
@@ -1038,10 +1034,6 @@ class FlexForm:
         return BuildResults(self, False, self)
 
     def KeyboardCallback(self, event ):
-<<<<<<< HEAD
-=======
-
->>>>>>> 531b32ab66746c9f4b6acd2ea8b6d113cb235827
         self.LastButtonClicked = None
         self.FormRemainedOpen = True
         if event.char != '':
@@ -1060,10 +1052,6 @@ class FlexForm:
             BuildResults(self, False, self)
         self.TKroot.quit()
 
-<<<<<<< HEAD
-=======
-
->>>>>>> 531b32ab66746c9f4b6acd2ea8b6d113cb235827
 
     def _Close(self):
         try:
@@ -1826,10 +1814,6 @@ def StartupTK(my_flex_form):
     # root.bind('<Destroy>', MyFlexForm.DestroyedCallback())
     ConvertFlexToTK(my_flex_form)
     my_flex_form.SetIcon(my_flex_form.WindowIcon)
-<<<<<<< HEAD
-=======
-
->>>>>>> 531b32ab66746c9f4b6acd2ea8b6d113cb235827
     if my_flex_form.ReturnKeyboardEvents and not my_flex_form.NonBlocking:
         root.bind("<KeyRelease>", my_flex_form.KeyboardCallback)
         root.bind("<MouseWheel>", my_flex_form.MouseWheelCallback)