From 075b4fce3d57a2d4d7b0ba56478fba399272b4ae Mon Sep 17 00:00:00 2001
From: ArsenArsen <ArsenArsen@users.noreply.github.com>
Date: Wed, 17 May 2017 13:57:47 +0200
Subject: [PATCH] smh

---
 KShare.pro | 1 -
 1 file changed, 1 deletion(-)

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 \