1 files changed, 1 insertions, 0 deletions
diff --git a/src/autosaver.h b/src/autosaver.h
index e0de8ea5..b486fcb9 100644
--- a/src/autosaver.h
+++ b/src/autosaver.h
@@ -38,6 +38,7 @@
  *
  */
 
+>>>>>>> master:src/autosaver.h
 class AutoSaver : public QObject
 {
     Q_OBJECT