From b3ec3e13a2a28400bcbcd45654591f909774fdd7 Mon Sep 17 00:00:00 2001 From: samaradel Date: Thu, 13 Oct 2022 12:15:56 +0200 Subject: [PATCH] rm conflict sign --- content/_index.md | 1 - 1 file changed, 1 deletion(-) diff --git a/content/_index.md b/content/_index.md index 011cbcd7b..d2b976527 100644 --- 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 ---