summaryrefslogtreecommitdiff
path: root/helpers
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2014-08-06 18:39:17 +0200
committerDavid Tardon <dtardon@redhat.com>2014-08-06 18:39:17 +0200
commit9411c73cf8ac2f036ce21c99962788e59148158c (patch)
treec84326a5d789192fe8bc641c0965684ac46aef14 /helpers
parentcc5bb5cd5316199307fcafa59583314f040b8733 (diff)
update help ids for Resolve Conflicts dlg
Change-Id: I5b682de419e348bfe46ac34fcd1ac72251cbef2d
Diffstat (limited to 'helpers')
-rw-r--r--helpers/help_hid.lst5
1 files changed, 0 insertions, 5 deletions
diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index d33cab66a7..8a97f7fd18 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2551,7 +2551,6 @@ HID_RPT_START_IMAGE,64517,
HID_RPT_START_TITLE,64516,
HID_RPT_VERT_SCROLLBAR,64459,
HID_RUBY_DIALOG,34187,
-HID_SCDLG_CONFLICTS,59023,
HID_SCH_CT_INDICATE,63291,
HID_SCH_DATA_SERIES_LABEL,63367,
HID_SCH_LEGEND_POS_BOTTOM,63343,
@@ -5073,10 +5072,6 @@ sc_ListBox_RID_SCPAGE_SORT_FIELDS_LB_SORT3,956435974,
sc_ModalDialog_RID_SCDLG_GROUP,1493549056,
sc_NumericField_RID_SCPAGE_CALC_ED_PREC,957257735,
sc_NumericField_RID_SCPAGE_CALC_ED_STEPS,957257732,
-sc_PushButton_RID_SCDLG_CONFLICTS_BTN_KEEPALLMINE,1495585286,
-sc_PushButton_RID_SCDLG_CONFLICTS_BTN_KEEPALLOTHERS,1495585287,
-sc_PushButton_RID_SCDLG_CONFLICTS_BTN_KEEPMINE,1495585283,
-sc_PushButton_RID_SCDLG_CONFLICTS_BTN_KEEPOTHER,1495585284,
sc_RadioButton_RID_SCPAGE_CALC_BTN_DATE1904,957252107,
sc_RadioButton_RID_SCPAGE_CALC_BTN_DATESC10,957252106,
sc_RadioButton_RID_SCPAGE_CALC_BTN_DATESTD,957252105,