From a018f2a2ae731b2443a7c0faff5341293b9cf6cd Mon Sep 17 00:00:00 2001
From: DeadlyMC <modding.deadlymc@gmail.com>
Date: Sun, 2 Jun 2019 22:53:33 +0530
Subject: [PATCH] fix merge conflicts

---
 src/main/resources/carpet.mixins.json | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/carpet.mixins.json b/src/main/resources/carpet.mixins.json
index 7f5c43a0..a2b25c7e 100644
--- a/src/main/resources/carpet.mixins.json
+++ b/src/main/resources/carpet.mixins.json
@@ -48,14 +48,10 @@
     "FossilFeatureMixin",
     "BuriedTreasureGeneratorPieceMixin",
     "GravityStructureProcessorMixin",
-<<<<<<< HEAD
-    "EntityMixin",
-    "DirectionMixin",
-=======
     "ServerPlayNetworkHandler_scarpetEventsMixin",
     "ServerPlayerInteractionManager_scarpetEventsMixin",
->>>>>>> master
-
+    "EntityMixin",
+    "DirectionMixin",
 
     "ServerChunkManagerMixin",
     "SpawnHelperMixin",