From 9888a6eb42ec60c366cbf1afaedb0d21bff71351 Mon Sep 17 00:00:00 2001
From: Arjen Hiemstra <ahiemstra@heimr.nl>
Date: Fri, 21 Aug 2015 18:28:53 +0200
Subject: [PATCH] Fix a merge error

---
 cura/CuraApplication.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py
index a0e02874de..a7d3f1c2ff 100644
--- a/cura/CuraApplication.py
+++ b/cura/CuraApplication.py
@@ -38,11 +38,7 @@ from . import PrintInformation
 from . import CuraActions
 from . import MultiMaterialDecorator
 
-<<<<<<< HEAD
-from PyQt5.QtCore import pyqtSlot, QUrl, Qt, pyqtSignal, pyqtProperty, Q_ENUMS
-=======
-from PyQt5.QtCore import pyqtSlot, QUrl, Qt, pyqtSignal, pyqtProperty, QEvent
->>>>>>> 3cb3cce31c821a56d2395607a90b51030fdf0916
+from PyQt5.QtCore import pyqtSlot, QUrl, Qt, pyqtSignal, pyqtProperty, QEvent, Q_ENUMS
 from PyQt5.QtGui import QColor, QIcon
 
 import platform