From c95dc50b42c352580b5669642aecb9aaae5160ee Mon Sep 17 00:00:00 2001
From: Michail Brynard <mbrynard@gmail.com>
Date: Thu, 22 Apr 2021 19:04:13 +0200
Subject: [PATCH] Fix submodule merge issue

---
 .gitmodules | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 053755f..43b9c6a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,3 @@
 [submodule "themes/hexon-hugo-theme"]
 	path = themes/hexon-hugo-theme
-<<<<<<< HEAD
 	url = git@github.com:OdinsPlasmaRifle/hexon-hugo-theme.git
-=======
-	url = https://github.com/OdinsPlasmaRifle/hexon-hugo-theme.git
->>>>>>> 352468ee464880e3a784cf2ad787f278d79c94a6