Tag: cws_src680_dba24d
User: oj      
Date: 2007-11-07 07:52:21+0000
Modified:
   dba/dbaccess/source/ui/dlg/advancedsettings.src

Log:
 merge conflict

File Changes:

Directory: /dba/dbaccess/source/ui/dlg/
=======================================

File [changed]: advancedsettings.src
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/advancedsettings.src?r1=1.3.2.1&r2=1.3.2.2
Delta lines:  +2 -3
-------------------
--- advancedsettings.src        2007-11-07 07:47:05+0000        1.3.2.1
+++ advancedsettings.src        2007-11-07 07:52:18+0000        1.3.2.2
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: advancedsettings.src,v $
  *
- *  $Revision: 1.3.2.1 $
+ *  $Revision: 1.3.2.2 $
  *
- *  last change: $Author: oj $ $Date: 2007/11/07 07:47:05 $
+ *  last change: $Author: oj $ $Date: 2007/11/07 07:52:18 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -187,7 +187,6 @@
        {                                                                       
                                                                                
        \
                Pos             = MAP_APPFONT ( 6 , AUTO_Y ) ;                  
                                                        \
                Size    = MAP_APPFONT ( ADVANCED_PAGE_X -12 , CHECKBOX_HEIGHT ) 
;                       \
-               Group   = TRUE ;                                                
                                                                        \
                TabStop = TRUE ;                                                
                                                                        \
                HelpId = HID_DSADMIN_IGNORECURRENCY;                            
                                                \
                Text [ en-US ] = "Ignore currency field information";           
                                \




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to