1.1 --- a/texteditor.cpp	Fri Jul 08 07:24:43 2005 +0000
     1.2 +++ b/texteditor.cpp	Fri Jul 08 08:06:36 2005 +0000
     1.3 @@ -115,14 +115,10 @@
     1.4  		actionSettingsFonthintDefault->setOn (false);
     1.5  		e->setCurrentFont (varFont);
     1.6  	}	
     1.7 -<<<<<<< texteditor.cpp
     1.8  	filenameHint="";
     1.9  
    1.10  	// Save settings in vymrc
    1.11  	settings.writeEntry("/vym/mainwindow/printerName",printer->printerName());
    1.12 -=======
    1.13 -	filenameHint="";
    1.14 ->>>>>>> 1.4
    1.15  }
    1.16  
    1.17