1.1 --- a/floatimageobj.cpp	Fri Jul 08 07:24:42 2005 +0000
     1.2 +++ b/floatimageobj.cpp	Mon Sep 05 11:56:31 2005 +0000
     1.3 @@ -66,7 +66,6 @@
     1.4  
     1.5  int FloatImageObj::z ()
     1.6  {
     1.7 -<<<<<<< floatimageobj.cpp
     1.8  	return qRound (icon->z());
     1.9  }
    1.10  
    1.11 @@ -77,9 +76,6 @@
    1.12    positionBBox();
    1.13    filetype="PNG";
    1.14    filename="noname.png";
    1.15 -=======
    1.16 -	return qRound (icon->z());
    1.17 ->>>>>>> 1.2
    1.18  }
    1.19  
    1.20  bool FloatImageObj::load (const QString &fn)