From 054ae2ee4480b5a18091c7775e9e554269af0e5a Mon Sep 17 00:00:00 2001
From: apple502j <33279053+apple502j@users.noreply.github.com>
Date: Thu, 29 Feb 2024 12:35:47 +0900
Subject: [PATCH] Fix conflict

---
 mappings/net/minecraft/component/Component.mapping | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mappings/net/minecraft/component/Component.mapping b/mappings/net/minecraft/component/Component.mapping
index 71a99d9858..20a3bda9eb 100644
--- a/mappings/net/minecraft/component/Component.mapping
+++ b/mappings/net/minecraft/component/Component.mapping
@@ -6,9 +6,9 @@ CLASS net/minecraft/class_9336 net/minecraft/component/Component
 		ARG 0 type
 		ARG 1 value
 	CLASS 1
-		METHOD method_57949 decode (Lnet/minecraft/class_9129;Lnet/minecraft/class_9331;)Lnet/minecraft/class_9336;
+		METHOD method_57949 read (Lnet/minecraft/class_9129;Lnet/minecraft/class_9331;)Lnet/minecraft/class_9336;
 			ARG 0 buf
 			ARG 1 type
-		METHOD method_57951 encode (Lnet/minecraft/class_9129;Lnet/minecraft/class_9336;)V
+		METHOD method_57951 write (Lnet/minecraft/class_9129;Lnet/minecraft/class_9336;)V
 			ARG 0 buf
 			ARG 1 component