formatting in readme

LofiMonk · Mar 6, 2021 · 24c6b78 · 24c6b78
1 parent 747e2d8
commit 24c6b78
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -19,10 +19,8 @@ Check the [release](https://github.com/drewcifer/bot-topia/releases/latest) page
 
 ## Special Thanks
 
-<<<<<<< HEAD
-Dr.Sonic @otakonz @gsdev215 @FreedHellFire
-=======
+
 Dr.Sonic, otakonz, GS.Dev, freeHellfire, kradarak
->>>>>>> working
+
 
 This is an addon for Minecraft Bedrock made with [Bridge.](https://github.com/bridge-core/bridge.)