AllLangHelp_shared.mk | 4 ----
1 file changed, 4 deletions(-)
New commits:
commit e64e6e22988127f85a4d5ec5c9e37038ae7a82ee
Author: Olivier Hallot <[email protected]>
AuthorDate: Wed Jun 21 19:14:21 2023 +0200
Commit: Olivier Hallot <[email protected]>
CommitDate: Wed Jun 21 19:18:39 2023 +0200
fix makefile
Change-Id: Ia57f04ba2103b8925429c6aff75aea5ea5e81a29
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/153414
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <[email protected]>
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 \
