Fix navigation

decidim · Nov 20, 2024 · cd77162 · cd77162
1 parent 7b6c119
commit cd77162
Showing 1 changed file with 0 additions and 5 deletions.
diff --git 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]