From 7d52958b7e472d378a16df74c57bef2c27215253 Mon Sep 17 00:00:00 2001
From: Tae Hyeon Kweon <taehyeon.kweon@gmail.com>
Date: Sun, 10 Nov 2024 00:06:50 -0500
Subject: [PATCH] update

---
 _config.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/_config.yml b/_config.yml
index 3b0ab11d11864..b1374bb8d37c3 100644
--- 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