1.1 --- a/texteditor.cpp	Fri Jul 08 07:24:43 2005 +0000
     1.2 +++ b/texteditor.cpp	Fri Jul 08 07:24:43 2005 +0000
     1.3 @@ -61,6 +61,7 @@
     1.4  TextEditor::TextEditor()
     1.5  {
     1.6      printer = new QPrinter( QPrinter::HighResolution );
     1.7 +	printer->setPrinterName (settings.readEntry("/vym/mainwindow/printerName",printer->printerName()));
     1.8  
     1.9  	// Editor
    1.10      e = new QTextEdit( this, "editor" );
    1.11 @@ -114,7 +115,14 @@
    1.12  		actionSettingsFonthintDefault->setOn (false);
    1.13  		e->setCurrentFont (varFont);
    1.14  	}	
    1.15 +<<<<<<< texteditor.cpp
    1.16  	filenameHint="";
    1.17 +
    1.18 +	// Save settings in vymrc
    1.19 +	settings.writeEntry("/vym/mainwindow/printerName",printer->printerName());
    1.20 +=======
    1.21 +	filenameHint="";
    1.22 +>>>>>>> 1.4
    1.23  }
    1.24  
    1.25  

     2.1 --- a/version.h	Fri Jul 08 07:24:43 2005 +0000
     2.2 +++ b/version.h	Fri Jul 08 07:24:43 2005 +0000
     2.3 @@ -1,7 +1,12 @@
     2.4  #ifndef VERSION_H 
     2.5  #define VERSION_H
     2.6  
     2.7 +<<<<<<< version.h
     2.8 +#define __VYM_VERSION__ "1.6.9"
     2.9 +#define __BUILD_DATE__ "July 04, 2005"
    2.10 +=======
    2.11  #define __VYM_VERSION__ "1.6.8"
    2.12  #define __BUILD_DATE__ "June 14, 2005"
    2.13 +>>>>>>> 1.16
    2.14  
    2.15  #endif