Git conflicts

SkriptLang · Jan 2, 2025 · 40c76e8 · 40c76e8
1 parent 25dd483
commit 40c76e8
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 31 deletions.
diff --git a/src/main/java/ch/njol/skript/ScriptLoader.java b/src/main/java/ch/njol/skript/ScriptLoader.java
@@ -206,12 +206,7 @@ public static Set<Script> getScripts(File directory) {
 	private static final FileFilter disabledScriptFilter =
 		f -> f != null
 			&& (f.isDirectory() && !f.getName().startsWith(".") || !f.isDirectory() && StringUtils.endsWithIgnoreCase(f.getName(), ".sk"))
-<<<<<<< HEAD
-			&& f.getName().startsWith(DISABLED_SCRIPT_PREFIX)
-			&& !f.isHidden();
-=======
 			&& f.getName().startsWith(DISABLED_SCRIPT_PREFIX) && !f.isHidden();
->>>>>>> 5a4fb7ed02618575e7b19af507ae2047ebb2892e
 
 	/**
 	 * Reevaluates {@link #disabledScripts}.

diff --git a/src/main/java/ch/njol/skript/effects/EffSuppressWarnings.java b/src/main/java/ch/njol/skript/effects/EffSuppressWarnings.java
@@ -11,7 +11,6 @@
 import ch.njol.util.Kleenean;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.annotations.UnknownNullability;
 import org.skriptlang.skript.lang.script.ScriptWarning;
 
 @Name("Locally Suppress Warning")
@@ -78,31 +77,7 @@ protected void execute(Event event) { }
 
 	@Override
 	public String toString(@Nullable Event event, boolean debug) {
-<<<<<<< HEAD
-		String word;
-		switch (pattern) {
-			case INSTANCE:
-				word = "variable save";
-				break;
-			case CONJUNCTION:
-				word = "missing conjunction";
-				break;
-			case START_EXPR:
-				word = "starting expression";
-				break;
-			case DEPRECATED:
-				word = "deprecated syntax";
-				break;
-			case LOCAL_TYPES:
-				word = "local variable types";
-				break;
-			default:
-				throw new IllegalStateException();
-		}
-		return "suppress " + word + " warnings";
-=======
-		return "suppress " + warning.getWarningName() + " warnings";
->>>>>>> 5a4fb7ed02618575e7b19af507ae2047ebb2892e
+		return "suppress " + pattern.getWarning().getWarningName() + " warnings";
 	}
 
 }