From b05452ecf13d64b9874f9b0c9fc69c10b576682d Mon Sep 17 00:00:00 2001
From: Motschen <motschenfm@gmail.com>
Date: Sat, 28 Nov 2020 19:20:44 +0100
Subject: [PATCH] Update README.md

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

diff --git a/README.md b/README.md
index 7c72771..4700181 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,2 @@
-<<<<<<< Updated upstream
-# Smart Leaves
-=======
 # Cull Leaves
->>>>>>> Stashed changes
 Adds culling to leaf blocks, providing a huge performance boost over vanilla.