From e15c60172fe757d3950b7d9f7234ed0db63f681a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?AK9=E2=84=A2?= <anthonkrisat@hotmail.com>
Date: Sat, 18 Dec 2021 12:50:39 +0100
Subject: [PATCH] Update CHANGELOG.md

---
 CHANGELOG.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3b6abcc..00ef412 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 ### All of Fabric 4 | v1.1.4
 
 _Fabric Loader 0.12.12_
@@ -24,8 +23,6 @@ _Fabric Loader 0.12.12_
 
 ---
 
-=======
->>>>>>> main
 <h1>1.1.3</h1>
 
 <h2>Be sure to always backup your world(s) before updating!</h2>