diff -r 3b0b9352cf49 -r e7f59f62bbe3 floatimageobj.cpp
--- a/floatimageobj.cpp	Fri Jul 08 07:24:42 2005 +0000
+++ b/floatimageobj.cpp	Sat Jul 23 15:13:34 2005 +0000
@@ -66,7 +66,6 @@
 
 int FloatImageObj::z ()
 {
-<<<<<<< floatimageobj.cpp
 	return qRound (icon->z());
 }
 
@@ -77,9 +76,6 @@
   positionBBox();
   filetype="PNG";
   filename="noname.png";
-=======
-	return qRound (icon->z());
->>>>>>> 1.2
 }
 
 bool FloatImageObj::load (const QString &fn)