From 349140ca2787d3043d22feb86715ad68f6a2f273 Mon Sep 17 00:00:00 2001
From: lemonchann <12667888+lemonchann@users.noreply.github.com>
Date: Mon, 18 Nov 2019 13:38:56 +0800
Subject: [PATCH] Update _config.yml

---
 _config.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/_config.yml b/_config.yml
index 720a8ab..f1d6b95 100644
--- a/_config.yml
+++ b/_config.yml
@@ -68,7 +68,6 @@ gitalk:
   repo: endworld
   owner: FromEndWorld
 
-<<<<<<< HEAD
 # Enter your Google Analytics web tracking code (e.g. UA-2110908-2) to activate tracking
 google_analytics: UA-143053266-1