Fix rebase problems

SourceWriters · Jun 24, 2022 · 70d317c · 70d317c
1 parent dd0d599
commit 70d317c
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git 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/...java/net/sourcewriters/minecraft/vcompat/provider/impl/v1_18_R2/entity/Player1_18_R2.java b/...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);
             }