afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix merge conflict

Browse source
This commit is contained in:
Huy Pham 2019-12-09 16:37:52 -08:00
parent 542d632066
commit 7039a3682e
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
coretk/coretk/coreclient.py
View file

@ -282,11 +282,7 @@ class CoreClient:
self.app.toolbar.click_runtime_selection() self.app.toolbar.click_runtime_selection()
else: else:
self.app.toolbar.design_frame.tkraise() self.app.toolbar.design_frame.tkraise()
# <<<<<<< HEAD
# self.app.toolbar.select_button.invoke()
# =======
self.app.toolbar.click_selection() self.app.toolbar.click_selection()
# >>>>>>> coretk
self.app.statusbar.progress_bar.stop() self.app.statusbar.progress_bar.stop()
def is_runtime(self): def is_runtime(self):