Update CHANGELOG.md

TeamAOF · Dec 18, 2021 · e15c601 · e15c601
1 parent 9b4c492
commit e15c601
Showing 1 changed file with 0 additions and 3 deletions.
diff --git 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>