From 235d7f8d8026bf5cd3d547621e1ba05fba9e5f82 Mon Sep 17 00:00:00 2001
From: Smart123s <28480228+Smart123s@users.noreply.github.com>
Date: Sat, 22 May 2021 15:49:33 +0200
Subject: [PATCH] Add 'no-conflict' as an option to config.yml value checking
---
.../com/github/games647/fastlogin/bukkit/FastLoginBukkit.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/FastLoginBukkit.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/FastLoginBukkit.java
index 02cf0862..74d42207 100644
--- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/FastLoginBukkit.java
+++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/FastLoginBukkit.java
@@ -256,6 +256,7 @@ public class FastLoginBukkit extends JavaPlugin implements PlatformPlugin