creyD/intelliphoto
1
0
Fork 0
mirror of https://github.com/creyD/intelliphoto.git synced 2026-04-15 04:40:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
AshBastian
2020-01-09 00:52:17 +01:00
parent d774461b26
commit 8b1fd5c3f0
3 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Layer/PaintingArea.h
View File

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