From 70d317cf64710bf5466af338fe050041a7a974d0 Mon Sep 17 00:00:00 2001
From: Lauriichan <laura.endress@syntaxphoenix.com>
Date: Fri, 24 Jun 2022 11:47:58 +0200
Subject: [PATCH] Fix rebase problems

---
 pom.xml                                                      | 3 ---
 .../vcompat/provider/impl/v1_18_R2/entity/Player1_18_R2.java | 5 -----
 2 files changed, 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 274a55f..946ccf2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,9 +91,6 @@
 		<module>vcompat-1_17_R1</module>
 		<module>vcompat-1_18_R1</module>
 		<module>vcompat-1_18_R2</module>
-<<<<<<< HEAD
         <module>vcompat-1_19_R1</module>
-=======
->>>>>>> ef8c634 (Rebase (#41))
 	</modules>
 </project>
diff --git a/vcompat-1_18_R2/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_18_R2/entity/Player1_18_R2.java b/vcompat-1_18_R2/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_18_R2/entity/Player1_18_R2.java
index 6d3aa5c..f9e7817 100644
--- a/vcompat-1_18_R2/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_18_R2/entity/Player1_18_R2.java
+++ b/vcompat-1_18_R2/src/main/java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_18_R2/entity/Player1_18_R2.java
@@ -279,13 +279,8 @@ private final void update(boolean flag) {
                 properties.put("textures", new Property("textures", skin.getValue(), skin.getSignature()));
             }
 
-<<<<<<< HEAD
             String name = dataAdapter.get("name", WrapType.STRING);
             if (name != null && !name.isBlank()) {
-=======
-            String name = getName();
-            if (name != null) {
->>>>>>> ef8c634 (Rebase (#41))
                 VersionCompatProvider.get().getLookupProvider().getLookup("mjGameProfile").setFieldValue(profile, "name", name);
             }