rm conflict sign

2022-10-13 12:15:56 +02:00
parent 0aa6ecac0c
commit b3ec3e13a2
1 changed files with 0 additions and 1 deletions
--- a/content/_index.md
+++ b/content/_index.md
@@ -7,7 +7,6 @@ draft: false
 extra:
  author: Your name here
  imgPath: images/threefold_globe.png
-<<<<<<< HEAD
 ---