summaryrefslogtreecommitdiff
path: root/sc/source/ui/miscdlgs/conflictsdlg.src
diff options
context:
space:
mode:
authorJoseph Powers <jpowers27@cox.net>2010-11-21 07:59:32 -0800
committerJoseph Powers <jpowers27@cox.net>2010-11-21 07:59:32 -0800
commit831ccb009d55f939b54f41febfb5b3c7f2ec8736 (patch)
treedab034c8517cf1b81942d849351c48047fd01b84 /sc/source/ui/miscdlgs/conflictsdlg.src
parentde020ee8f86d0694c20622a1a1ffaef40ddeaec7 (diff)
.src cleanup and .png fixes
Diffstat (limited to 'sc/source/ui/miscdlgs/conflictsdlg.src')
-rw-r--r--sc/source/ui/miscdlgs/conflictsdlg.src7
1 files changed, 3 insertions, 4 deletions
diff --git a/sc/source/ui/miscdlgs/conflictsdlg.src b/sc/source/ui/miscdlgs/conflictsdlg.src
index dad8abb48..2e7bb6b93 100644
--- a/sc/source/ui/miscdlgs/conflictsdlg.src
+++ b/sc/source/ui/miscdlgs/conflictsdlg.src
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -49,7 +49,7 @@ ModalDialog RID_SCDLG_CONFLICTS
Pos = MAP_APPFONT ( 6 , 34 ) ;
Size = MAP_APPFONT ( 326 , 104 ) ;
Border = TRUE ;
- };
+ };
PushButton BTN_KEEPMINE
{
Pos = MAP_APPFONT ( 72 , 145 ) ;
@@ -87,7 +87,7 @@ ModalDialog RID_SCDLG_CONFLICTS
HelpButton BTN_HELP
{
Pos = MAP_APPFONT ( 282 , 172 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
+ Size = MAP_APPFONT ( 50 , 14 ) ;
};
String STR_TITLE_CONFLICT
{
@@ -106,4 +106,3 @@ ModalDialog RID_SCDLG_CONFLICTS
Text [ en-US ] = "Unknown User" ;
};
};
-