Add forgotten merge conflict fix

mitchcurtis · Jun 8, 2018 · f3e5781 · f3e5781
1 parent 8c62539
commit f3e5781
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/app/imagecanvas.h b/app/imagecanvas.h
@@ -26,11 +26,8 @@
 #include <QPixmap>
 #include <QQuickPaintedItem>
 #include <QStack>
-<<<<<<< HEAD
 #include <QTimerEvent>
-=======
 #include <QUndoStack>
->>>>>>> 5.12
 #include <QWheelEvent>
 
 #include "canvaspane.h"