summaryrefslogtreecommitdiff
path: root/src/autosaver.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/autosaver.h')
-rw-r--r--src/autosaver.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/autosaver.h b/src/autosaver.h
index b486fcb9..7ce44f78 100644
--- a/src/autosaver.h
+++ b/src/autosaver.h
@@ -38,7 +38,6 @@
*
*/
->>>>>>> master:src/autosaver.h
class AutoSaver : public QObject
{
Q_OBJECT
@@ -61,4 +60,3 @@ private:
};
#endif // AUTOSAVER_H
-