[SCL 3.21.5_02] Fix build crash

SolDev69 · Jun 18, 2024 · b4711d2 · b4711d2
1 parent 84d0cb1
commit b4711d2
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/NewJREUtil.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/NewJREUtil.java
@@ -112,9 +112,4 @@ private enum InternalRuntime {
             this.path = path;
         }
     }
-
-<<<<<<< HEAD
-}
-=======
 }
->>>>>>> upstream/v3_openjdk