strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge error

Browse source
This commit is contained in:
Christian Lippka 2010-01-06 10:44:38 +01:00
parent c79b3e827a
commit bc84f5ed2a
1 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
filter/source/pdf/impdialog.src
View file

@ -226,11 +226,7 @@ TabPage RID_PDF_TAB_GENER
};
CheckBox CB_EXPORTEMPTYPAGES
{
<<<<<<< local
Pos = MAP_APPFONT ( 12 , 216 ) ;
=======
Pos = MAP_APPFONT ( 12 , 219 ) ;
>>>>>>> other
Size = MAP_APPFONT ( 158 , 16 ) ;
TabStop = TRUE ;
WordBreak = TRUE ;
@ -238,11 +234,7 @@ TabPage RID_PDF_TAB_GENER
};
CheckBox CB_ADDSTREAM
{
<<<<<<< local
Pos = MAP_APPFONT ( 12 , 235 ) ;
=======
Pos = MAP_APPFONT ( 12 , 237 ) ;
>>>>>>> other
Size = MAP_APPFONT ( 158 , 10 ) ;
TabStop = TRUE ;
Text[ en-US ] = "Create ~hybrid file";