danamir/autodrob
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

0

Browse Source
This commit is contained in:
danamir
2018-05-02 23:47:35 +03:00
parent 0fce7ca1e9
commit 0b9c3a76d7
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gui/second_page.py
View File

@@ -43,16 +43,11 @@ class SecondPage(wx.Frame):
# Virtual event handlers, overide them in your derived class # Virtual event handlers, overide them in your derived class
def lab1(self, event): def lab1(self, event):
<<<<<<< HEAD
from labs.lab1 import lab1 from labs.lab1 import lab1
nex_page = lab1.MainFrame() nex_page = lab1.MainFrame()
nex_page.Show() nex_page.Show()
self.Destroy()
=======
from lab1 import lab1
nex_page = lab1.MainFrame()
nex_page.Show()
>>>>>>> origin/dev
app = wx.App(False) app = wx.App(False)