From c121f567b881f5b546a91a2b65dba96c30795aed Mon Sep 17 00:00:00 2001
From: StefanBerlin <rupp.stef@googlemail.com>
Date: Mon, 19 Jan 2015 16:15:37 +0100
Subject: [PATCH] removed merge error

---
 main.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/main.py b/main.py
index 11bed617..a135d63c 100644
--- 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