Fixed more conflicts

2017-04-30 12:05:30 -03:00 · 2017-04-30 12:05:30 -03:00 · 3268a49f82
commit 3268a49f82
parent 91fb50cc8b
1 changed files with 0 additions and 4 deletions
--- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java
+++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java
@ -156,13 +156,9 @@ public enum Rank
 	{
 		return _forumId;
 	}
-<<<<<<< HEAD

 	public DyeColor getDyeColor()
 	{
 		return _dyeColor;
 	}
 }
-=======
-}
->>>>>>> develop