diff -r 09edde7ae30e -r e0f6a21cc6d6 mapeditor.h
--- a/mapeditor.h	Fri Jul 08 07:24:43 2005 +0000
+++ b/mapeditor.h	Fri Jul 08 08:06:36 2005 +0000
@@ -35,19 +35,12 @@
 							// create subdirs in dir
     QString saveToDir(const QString&,const QString &,bool, const QPoint &,LinkableMapObj*);
     void saveState();		// save actual state to backup
-<<<<<<< mapeditor.h
     void saveState(LinkableMapObj *);
     void saveState(const QString &);
     void saveState(const SaveMode&, LinkableMapObj *, const QString &);
     void parseAtom(const QString &);	
 
     void addFloatImage(const QPixmap &img);
-=======
-    void saveState(LinkableMapObj *);
-    void saveState(const QString &);
-    void saveState(const SaveMode&, LinkableMapObj *, const QString &);
-    void parseAtom(const QString &);	
->>>>>>> 1.10
 
   private slots:
     void finishedLineEditNoSave();