1 files changed, 0 insertions, 3 deletions
diff --git a/index.gmi b/index.gmi
index fd71ec1e..7a4ddfdc 100644
--- a/index.gmi
+++ b/index.gmi
@@ -30,9 +30,6 @@ If you reach this site via the modern web, please read this:
 
 ### Posts
 
-<<<<<<< HEAD
-=======
->>>>>>> 8a8e28f6268cbc46c37f26e2ea6bf0ea93d7a489
 => ./gemfeed/2022-11-24-i-tried-emacs-but-i-switched-back-to-neovim.gmi 2022-11-24 - I tried (Doom) Emacs, but I switched back to (Neo)Vim
 => ./gemfeed/2022-10-30-installing-dtail-on-openbsd.gmi 2022-10-30 - Installing DTail on OpenBSD
 => ./gemfeed/2022-09-30-after-a-bad-nights-sleep.gmi 2022-09-30 - After a bad night's sleep