Fix some merge issues

Vineflower · Aug 20, 2024 · c80be61 · c80be61
1 parent 72687d6
commit c80be61
Show file tree

Hide file tree

Showing 9 changed files with 680 additions and 10 deletions.
diff --git a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
@@ -227,7 +227,7 @@ public interface IFernflowerPreferences {
 
   @Name("[Experimental] Use old try deduplication")
   @Description("Uses the older try deduplication algorithm for methods with obfuscated exceptions, which prefers ")
-  @Type(Type.BOOLEAN)
+  @Type(DecompilerOption.Type.BOOLEAN)
   String OLD_TRY_DEDUP = "old-try-dedup";
 
   @Name("Include Entire Classpath")