From 0b9c3a76d73f2bbeb8ad984dc3d731e840b9f38d Mon Sep 17 00:00:00 2001
From: danamir <danamir522@gmail.com>
Date: Wed, 2 May 2018 23:47:35 +0300
Subject: [PATCH] 0

---
 gui/second_page.py | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/gui/second_page.py b/gui/second_page.py
index 632c473..ec9fbaa 100644
--- a/gui/second_page.py
+++ b/gui/second_page.py
@@ -43,16 +43,11 @@ class SecondPage(wx.Frame):
 
     # Virtual event handlers, overide them in your derived class
     def lab1(self, event):
-<<<<<<< HEAD
         from labs.lab1 import lab1
         nex_page = lab1.MainFrame()
         nex_page.Show()
-        self.Destroy()
-=======
-        from lab1 import lab1
-        nex_page = lab1.MainFrame()
-        nex_page.Show()
->>>>>>> origin/dev
+
+
 
 
 app = wx.App(False)