Sorry falscher Merge

This commit is contained in:
AshBastian
2020-01-09 01:07:25 +01:00
parent 9af9969c2f
commit 73500db171
3 changed files with 0 additions and 13 deletions

View File

@@ -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;