From b4711d2c979faac2ba4a9a70a43cf8b2a8c32a57 Mon Sep 17 00:00:00 2001
From: SolDev69 <michaelcraft1104@gmail.com>
Date: Tue, 18 Jun 2024 19:44:51 -0400
Subject: [PATCH] [SCL 3.21.5_02] Fix build crash

---
 .../src/main/java/net/kdt/pojavlaunch/NewJREUtil.java        | 5 -----
 1 file changed, 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
index 2d630b4af9..3f7bcad6db 100644
--- 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