removed merge error

TUB-Control · Jan 19, 2015 · c121f56 · c121f56
1 parent 88cd43e
commit c121f56
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/main.py b/main.py
@@ -30,10 +30,6 @@
 
 import sys
 from papi.core import Core
-<<<<<<< HEAD
-=======
-from papi.gui.qt_dev.gui_main import startGUI as dev_startGui
->>>>>>> master
 from papi.gui.qt_new.main import startGUI as new_startGui