Fix merge marks
This commit is contained in:
parent
c784bc0bd1
commit
f3c1bc51ea
1 changed files with 0 additions and 7 deletions
|
|
@ -149,13 +149,6 @@ theme:
|
|||
- search.highlight # Highlight the search item in the page.
|
||||
- search.suggest # Suggest search results.
|
||||
- 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
|
||||
icon:
|
||||
annotation: material/plus-circle-outline
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue