From cfa8b821289f5128e9c05a533cba04f9c061a012 Mon Sep 17 00:00:00 2001
From: XiaoMoMi <70987828+Xiao-MoMi@users.noreply.github.com>
Date: Tue, 26 Jul 2022 17:01:39 +0800
Subject: [PATCH] Update README.md

---
 README.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/README.md b/README.md
index a841364..1444028 100644
--- a/README.md
+++ b/README.md
@@ -69,10 +69,6 @@ NEVER SET "only-grow-in-loaded-chunks" FALSE IF YOU DON'T DISABLE THE THREE FEAT
 ### Placeholders
 %customcrops_season% show the season in the world\
 %customcrops_season_[world]%\
-<<<<<<< HEAD
-=======
-
->>>>>>> 5b4051e47471e1fef498039557036ccff8060511
 ==== these papi below will be accurate only in "Auto" mode ====\
 %customcrops_nextseason% show the days to the next season\
 %customcrops_nextseason_[world]%\