Fix merge marks

This commit is contained in:
gugulethu 2025-06-20 18:32:03 +02:00
commit f3c1bc51ea

View file

@ -149,13 +149,6 @@ theme:
- search.highlight # Highlight the search item in the page. - search.highlight # Highlight the search item in the page.
- search.suggest # Suggest search results. - search.suggest # Suggest search results.
- search.share # Deep-link to a search results page. - search.share # Deep-link to a search results page.
<<<<<<< HEAD
=======
# font:
# text: Libre Baskerville
# code: DM Mono
>>>>>>> 86b6f0a (Use gh pages.)
# Icons to use for different tags and the repo.
font: false font: false
icon: icon:
annotation: material/plus-circle-outline annotation: material/plus-circle-outline