fixed conflict

2015-07-10 22:28:43 +02:00
parent 926ec808f5 ffab80188f
commit b87768478d
14 changed files with 322 additions and 165 deletions
@@ -848,6 +848,8 @@ public final class Settings extends YamlConfiguration {
        pt,
        nl,
        gl,
-        bg
+        bg,
+        eu,
+        tr
    }
 }