From cc0d3a8e490b005a5b2e0c417dd6538029842175 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Wed, 6 Nov 2013 20:12:39 +1100
Subject: [PATCH] Config -> Conf to prevent messup with shades. How did this
 skip by?

---
 proxy/src/main/java/net/md_5/bungee/BungeeCord.java           | 4 ++--
 .../java/net/md_5/bungee/{config => conf}/Configuration.java  | 2 +-
 .../java/net/md_5/bungee/{config => conf}/YamlConfig.java     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename proxy/src/main/java/net/md_5/bungee/{config => conf}/Configuration.java (99%)
 rename proxy/src/main/java/net/md_5/bungee/{config => conf}/YamlConfig.java (99%)

diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
index 30065b6b..1bd67113 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -17,7 +17,7 @@ import io.netty.channel.MultithreadEventLoopGroup;
 import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.channel.socket.nio.NioServerSocketChannel;
 import io.netty.util.ResourceLeakDetector;
-import net.md_5.bungee.config.Configuration;
+import net.md_5.bungee.conf.Configuration;
 import java.io.File;
 import java.io.IOException;
 import java.io.PrintStream;
@@ -53,7 +53,7 @@ import net.md_5.bungee.api.plugin.Plugin;
 import net.md_5.bungee.api.plugin.PluginManager;
 import net.md_5.bungee.api.tab.CustomTabList;
 import net.md_5.bungee.command.*;
-import net.md_5.bungee.config.YamlConfig;
+import net.md_5.bungee.conf.YamlConfig;
 import net.md_5.bungee.log.LoggingOutputStream;
 import net.md_5.bungee.netty.PipelineUtils;
 import net.md_5.bungee.protocol.DefinedPacket;
diff --git a/proxy/src/main/java/net/md_5/bungee/config/Configuration.java b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
similarity index 99%
rename from proxy/src/main/java/net/md_5/bungee/config/Configuration.java
rename to proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
index c45643fb..ce2c8300 100644
--- a/proxy/src/main/java/net/md_5/bungee/config/Configuration.java
+++ b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
@@ -1,4 +1,4 @@
-package net.md_5.bungee.config;
+package net.md_5.bungee.conf;
 
 import com.google.common.base.Preconditions;
 import com.google.common.io.BaseEncoding;
diff --git a/proxy/src/main/java/net/md_5/bungee/config/YamlConfig.java b/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
similarity index 99%
rename from proxy/src/main/java/net/md_5/bungee/config/YamlConfig.java
rename to proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
index 8f58a497..fca930f6 100644
--- a/proxy/src/main/java/net/md_5/bungee/config/YamlConfig.java
+++ b/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
@@ -1,4 +1,4 @@
-package net.md_5.bungee.config;
+package net.md_5.bungee.conf;
 
 import java.io.File;
 import java.io.FileInputStream;