Fix submodule merge issue

rehive · Apr 22, 2021 · c95dc50 · c95dc50
1 parent bc53844
commit c95dc50
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,7 +1,3 @@
 [submodule "themes/hexon-hugo-theme"]
 	path = themes/hexon-hugo-theme
-<<<<<<< HEAD
 	url = [email protected]:OdinsPlasmaRifle/hexon-hugo-theme.git
-=======
-	url = https://github.com/OdinsPlasmaRifle/hexon-hugo-theme.git
->>>>>>> 352468ee464880e3a784cf2ad787f278d79c94a6