From cd771627d7b21262733e717d492dd9846daadbad Mon Sep 17 00:00:00 2001 From: paulinebessoles Date: Wed, 20 Nov 2024 16:18:07 +0100 Subject: [PATCH] Fix navigation --- docs/en/modules/ROOT/nav.adoc | 5 ----- 1 file changed, 5 deletions(-) diff --git a/docs/en/modules/ROOT/nav.adoc b/docs/en/modules/ROOT/nav.adoc index 18ee7a35f..50cc754d2 100644 --- a/docs/en/modules/ROOT/nav.adoc +++ b/docs/en/modules/ROOT/nav.adoc @@ -131,15 +131,10 @@ *** xref:admin:features/versions.adoc[Versions] ** xref:admin:newsletters.adoc[Newsletters] ** xref:admin:global_moderations.adoc[Global moderations] -<<<<<<< HEAD -** Deprecated -*** xref:admin:information-pages.adoc[Information pages] ** xref:admin:templates.adoc[Templates] *** xref:admin:templates/questionnaires.adoc[Questionnaires templates] *** xref:admin:templates/block_users.adoc[Block user messages] *** xref:admin:templates/proposal_answers.adoc[Proposal answers] -======= ->>>>>>> develop * xref:contribute:index.adoc[Contribute] ** xref:contribute:governance.adoc[Governance]