From 4e574b8a94031ffb3214e9ee811096da15a53893 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Thu, 7 May 2009 01:35:48 +0200
Subject: Fixing forgotten merging issues..

---
 src/autosaver.h | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/autosaver.h')

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
-
-- 
cgit v1.2.1