Skip to content

OpenToonz - An open-source full-featured 2D animation creation software

C

Clean conflict markers from viewerpane.h

Ahl76338a5a288213
diff --git a/toonz/sources/toonz/viewerpane.h b/toonz/sources/toonz/viewerpane.h
index 408e0c2bf..a644bb1d2 100644
--- a/toonz/sources/toonz/viewerpane.h
+++ b/toonz/sources/toonz/viewerpane.h
@@ -10,11 +10,7 @@
#include "saveloadqsettings.h"
#include <QFrame>
-<<<<<<< HEAD
-=======
-#include <QContextMenuEvent>
#include <array>
->>>>>>> 37c40d2d3 (feat: persist viewer zoom/pan and reference mode across sessions)
class SceneViewer;
class QPoint;