diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-05-02 20:07:57 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-05-02 20:07:57 +0200 |
| commit | f1ed6d09e315a4138c131adb68e41dd52a41567a (patch) | |
| tree | 9b1702c53d70c96c7a1639ef037c6eedb63d50ca | |
| parent | 6a8d8c4bbd248816ce8d542c293e3db2f8df384c (diff) | |
fix build
Change-Id: I75abbce3f110e8d757aed56a879dc7305f8a5791
| -rw-r--r-- | sc/inc/globstr.hrc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc index d54d8552e2de..1fdc6a5bc1e4 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 |