diff options
| author | Olivier Hallot <olivier.hallot@libreoffice.org> | 2023-06-21 19:14:21 +0200 |
|---|---|---|
| committer | Olivier Hallot <olivier.hallot@libreoffice.org> | 2023-06-21 19:18:39 +0200 |
| commit | e64e6e22988127f85a4d5ec5c9e37038ae7a82ee (patch) | |
| tree | b6507830153e0266ea588e7e1146b3d6db614609 | |
| parent | e92f3f0c4e71f7807e34829cba807d13538ca0c3 (diff) | |
fix makefile
Change-Id: Ia57f04ba2103b8925429c6aff75aea5ea5e81a29
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/153414
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
| -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 \ |