Fixes

src/Image/IntelliImage.h

@@ -8,11 +8,8 @@
 #include <QWidget>
 #include <vector>
 
-<<<<<<< src/Image/IntelliImage.h
 #include "IntelliHelper/IntelliRenderSettings.h"
-=======
 #include "IntelliHelper/IntelliTriangulation.h"
->>>>>>> src/Image/IntelliImage.h
 
 class IntelliTool;
 

src/IntelliPhoto.pro

@@ -21,12 +21,9 @@ SOURCES += \
     Image/IntelliRasterImage.cpp \
     Image/IntelliShapedImage.cpp \
     IntelliHelper/IntelliColorPicker.cpp \
-<<<<<<< src/IntelliPhoto.pro
     IntelliHelper/IntelliRenderSettings.cpp \
-=======
     IntelliHelper/IntelliToolsettings.cpp \
     IntelliHelper/IntelliTriangulation.cpp \
->>>>>>> src/IntelliPhoto.pro
     Layer/PaintingArea.cpp \
     Tool/IntelliTool.cpp \
     Tool/IntelliToolCircle.cpp \
@@ -44,13 +41,9 @@ HEADERS += \
     Image/IntelliRasterImage.h \
     Image/IntelliShapedImage.h \
     IntelliHelper/IntelliColorPicker.h \
-<<<<<<< src/IntelliPhoto.pro
-    IntelliHelper/IntelliHelper.h \
     IntelliHelper/IntelliRenderSettings.h \
-=======
     IntelliHelper/IntelliToolsettings.h \
     IntelliHelper/IntelliTriangulation.h \
->>>>>>> src/IntelliPhoto.pro
     Layer/PaintingArea.h \
     Tool/IntelliTool.h \
     Tool/IntelliToolCircle.h \

src/Layer/PaintingArea.h

@@ -204,10 +204,7 @@ private:
     int maxWidth;
     int maxHeight;
 
-<<<<<<< src/Layer/PaintingArea.h
     IntelliRenderSettings renderSettings;
-=======
->>>>>>> src/Layer/PaintingArea.h
     IntelliTool* Tool;
 
     std::vector<LayerObject> layerBundle;