diff -r 09edde7ae30e -r e0f6a21cc6d6 texteditor.cpp
--- a/texteditor.cpp	Fri Jul 08 07:24:43 2005 +0000
+++ b/texteditor.cpp	Fri Jul 08 08:06:36 2005 +0000
@@ -115,14 +115,10 @@
 		actionSettingsFonthintDefault->setOn (false);
 		e->setCurrentFont (varFont);
 	}	
-<<<<<<< texteditor.cpp
 	filenameHint="";
 
 	// Save settings in vymrc
 	settings.writeEntry("/vym/mainwindow/printerName",printer->printerName());
-=======
-	filenameHint="";
->>>>>>> 1.4
 }