1.1 --- a/mapeditor.h	Fri Jul 08 07:24:43 2005 +0000
     1.2 +++ b/mapeditor.h	Wed Jul 13 10:22:14 2005 +0000
     1.3 @@ -35,19 +35,12 @@
     1.4  							// create subdirs in dir
     1.5      QString saveToDir(const QString&,const QString &,bool, const QPoint &,LinkableMapObj*);
     1.6      void saveState();		// save actual state to backup
     1.7 -<<<<<<< mapeditor.h
     1.8      void saveState(LinkableMapObj *);
     1.9      void saveState(const QString &);
    1.10      void saveState(const SaveMode&, LinkableMapObj *, const QString &);
    1.11      void parseAtom(const QString &);	
    1.12  
    1.13      void addFloatImage(const QPixmap &img);
    1.14 -=======
    1.15 -    void saveState(LinkableMapObj *);
    1.16 -    void saveState(const QString &);
    1.17 -    void saveState(const SaveMode&, LinkableMapObj *, const QString &);
    1.18 -    void parseAtom(const QString &);	
    1.19 ->>>>>>> 1.10
    1.20  
    1.21    private slots:
    1.22      void finishedLineEditNoSave();