diff options
| -rw-r--r-- | AllLangHelp_shared.mk | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk index ff0553a685..1157d06aa7 100644 --- a/AllLangHelp_shared.mk +++ b/AllLangHelp_shared.mk @@ -387,11 +387,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\ helpcontent2/source/text/shared/01/selectcertificate \ helpcontent2/source/text/shared/01/select_template_category \ helpcontent2/source/text/shared/01/timestampauth \ -<<<<<<< HEAD (10a36b tdf#155875 Tab'd UI commands Writer/Insert in Help) - helpcontent2/source/text/shared/guide/tipoftheday \ -======= helpcontent2/source/text/shared/01/view_comments \ ->>>>>>> CHANGE (4346eb tdf#155875 Tab'd UI commands Writer/Insert in Help) helpcontent2/source/text/shared/01/webhtml \ helpcontent2/source/text/shared/01/xformsdata \ helpcontent2/source/text/shared/01/xformsdataadd \ |