smh

2017-05-17 13:57:47 +02:00 · 2017-05-17 13:57:47 +02:00 · 075b4fce3d
parent 57e71be60a
commit 075b4fce3d
1 changed files with 0 additions and 1 deletions
--- a/KShare.pro
+++ b/KShare.pro
@ -91,7 +91,6 @@ mac {
 } else {
        error(Unsupported platform);
 }
->>>>>>> feature/platformbackends

 FORMS    += mainwindow.ui \
    cropeditor/settings/brushpenselection.ui \