diff --git a/KShare.pro b/KShare.pro
index db8e106..970ccbe 100644
--- a/KShare.pro
+++ b/KShare.pro
@@ -91,7 +91,6 @@ mac {
 } else {
         error(Unsupported platform);
 }
->>>>>>> feature/platformbackends
 
 FORMS    += mainwindow.ui \
     cropeditor/settings/brushpenselection.ui \