update

taehyeonkweon · Nov 10, 2024 · 7d52958 · 7d52958
1 parent 3b15fa5
commit 7d52958
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/_config.yml b/_config.yml
@@ -82,7 +82,6 @@ analytics:
     tracking_id          :
 
 
-<<<<<<< HEAD
 # Site Author
 author:
   name             : "Tae Hyeon Kweon"
@@ -122,8 +121,6 @@ author:
   wikipedia        :
 
 
-=======
->>>>>>> upstream/master
 # Reading Files
 include:
   - .htaccess