CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove final conflict - kept by mistake

Browse Source 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
This commit is contained in:
TheKodeToad 2023-09-02 22:38:14 +01:00
parent 347228a246
commit 19b5a5e00b
No known key found for this signature in database
GPG Key ID: 5E39D70B4C93C38E
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/launcher/legacy/org/prismlauncher/legacy/LegacyLauncher.java
View File

@ -122,7 +122,6 @@ final class LegacyLauncher extends AbstractLauncher {
MethodHandle method = ReflectionUtils.findMainMethod(main); MethodHandle method = ReflectionUtils.findMainMethod(main);
method.invokeExact(gameArgs.toArray(new String[0])); method.invokeExact(gameArgs.toArray(new String[0]));
} }
<<<<<<< HEAD:libraries/launcher/legacy/org/prismlauncher/legacy/LegacyLauncher.java
private static Applet createAppletClass(String clazz) throws Throwable { private static Applet createAppletClass(String clazz) throws Throwable {
Class<?> appletClass = ClassLoader.getSystemClassLoader().loadClass(clazz); Class<?> appletClass = ClassLoader.getSystemClassLoader().loadClass(clazz);
@ -153,7 +152,4 @@ final class LegacyLauncher extends AbstractLauncher {
return null; return null;
} }
=======
>>>>>>> upstream/develop:libraries/launcher/org/prismlauncher/launcher/impl/legacy/LegacyLauncher.java
} }