sc/source/ui/src/scfuncs.src |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 9e87f75ee5549b8bd30cf71936b7ecc1b7d40d66
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date:   Sun Jun 16 16:26:50 2013 +0200

    fix merge errors
    
    Change-Id: I0d9cae8f5ac06a90f4e3e000c6a3648a5cefe839

diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index 079af96..d67d870 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -9730,7 +9730,8 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         String 7 // Description of Parameter 3
         {
             Text [ en-US ] = "The number of characters for the text." ;
-        }
+        };
+    };
     Resource SC_OPCODE_FILTERXML
     {
         ExtraData =
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to