diff options
| author | Joerg Skottke [jsk] <jsk@openoffice.org> | 2010-07-08 13:01:33 +0200 |
|---|---|---|
| committer | Joerg Skottke [jsk] <jsk@openoffice.org> | 2010-07-08 13:01:33 +0200 |
| commit | b1c7502da9ed85d88e28e9feeedf7591d13e9b17 (patch) | |
| tree | 789a127a978089f1bc92cc73e3242f336aa831d2 /testautomation | |
| parent | d0b347318f5a56df7c83e6d6755aab1de94a5666 (diff) | |
automationdev300m84: Removed merge markers at the end of the file.
Diffstat (limited to 'testautomation')
| -rwxr-xr-x | testautomation/global/win/edia_d_h.win | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/testautomation/global/win/edia_d_h.win b/testautomation/global/win/edia_d_h.win index 4e76a335444a..5bebed65637f 100755 --- a/testautomation/global/win/edia_d_h.win +++ b/testautomation/global/win/edia_d_h.win @@ -505,4 +505,4 @@ DetectSpecialNumbers sc:CheckBox:RID_SCDLG_TEXT_IMPORT_OPTIONS:BTN_CONVERT_DATE *HyperlinkDialog HID_HYPERLINK_DIALOG CloseButton HID_ICCDIALOG_CANCEL_BTN ApplyButton HID_ICCDIALOG_OK_BTN -BackButton HID_ICCDIALOG_BACK_BTN>>>>>>> other +BackButton HID_ICCDIALOG_BACK_BTN |