Conflicts

SkriptLang · Sep 20, 2024 · d6c2608 · d6c2608
1 parent 427f0ee
commit d6c2608
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -164,6 +164,9 @@ fabric.properties
 
 .idea/
 
+### VS Code ###
+.vscode/
+
 # Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023
 
 *.iml

diff --git a/src/main/java/org/skriptlang/skript/variables/storage/H2Storage.java b/src/main/java/org/skriptlang/skript/variables/storage/H2Storage.java
@@ -20,10 +20,9 @@
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.function.BiFunction;
 import java.util.function.Function;
 
-import org.eclipse.jdt.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import com.zaxxer.hikari.HikariConfig;
 

diff --git a/src/main/java/org/skriptlang/skript/variables/storage/MySQLStorage.java b/src/main/java/org/skriptlang/skript/variables/storage/MySQLStorage.java
@@ -31,7 +31,7 @@
 
 import com.zaxxer.hikari.HikariConfig;
 
-import org.eclipse.jdt.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 public class MySQLStorage extends JdbcStorage {
 

diff --git a/src/main/java/org/skriptlang/skript/variables/storage/package-info.java b/src/main/java/org/skriptlang/skript/variables/storage/package-info.java
@@ -16,9 +16,4 @@
  *
  * Copyright Peter Güttinger, SkriptLang team and contributors
  */
-@NonNullByDefault({DefaultLocation.PARAMETER, DefaultLocation.RETURN_TYPE, DefaultLocation.FIELD})
 package org.skriptlang.skript.variables.storage;
-
-import org.eclipse.jdt.annotation.DefaultLocation;
-import org.eclipse.jdt.annotation.NonNullByDefault;
-