mirror of
https://github.com/creyD/intelliphoto.git
synced 2026-04-14 20:30:32 +02:00
Sorry falscher Merge
This commit is contained in:
@@ -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;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user