sc/inc/globstr.hrc | 1 -
1 file changed, 1 deletion(-)
New commits:
commit f1ed6d09e315a4138c131adb68e41dd52a41567a
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Fri May 2 20:07:57 2014 +0200
fix build
Change-Id: I75abbce3f110e8d757aed56a879dc7305f8a5791
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index d54d855..1fdc6a5 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -493,7 +493,6 @@
#define STR_SCATTR_PAGE_SCALE_PAGES 389
#define STR_SCATTR_PAGE_SCALE_AUTO 390
-<<<<<<< HEAD
#define STR_UNDO_TAB_RTL 391
#define STR_UNDO_HANGULHANJA 392
#define STR_UNDO_CHINESE_TRANSLATION 393
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
