Fix conflicts in _config.yml

lebathang · Apr 22, 2024 · 9f24022 · 9f24022
1 parent 6bbf4a4
commit 9f24022
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/_config.yml b/_config.yml
@@ -10,11 +10,9 @@
 ############################
 
 # Name of website
-<<<<<<< HEAD
+
 title: Blog for share
-=======
-title: My website
->>>>>>> b57d3d4a4abd3027edc8c39e2749a57b53f9a5e2
+
 
 # Your name to show in the footer
 author: Le Ba Thang