fixed merge error

2015-10-10 10:37:20 +11:00 · 2015-10-10 10:37:20 +11:00 · d99c64e45d
commit d99c64e45d
parent 02c6eccfda
1 changed files with 0 additions and 5 deletions
--- a/Plugins/Mineplex.Core/src/mineplex/core/notifier/NotificationManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/notifier/NotificationManager.java
@ -17,13 +17,8 @@ import mineplex.core.updater.event.UpdateEvent;

 public class NotificationManager extends MiniPlugin
 {
-<<<<<<< HEAD
-	private boolean _enabled = true;
-
-=======
 	private boolean _enabled = false;
 	
->>>>>>> ba36ff565d82eac5c4ee9f8ddd11de874a444238
 	private CoreClientManager _clientManager;

 	private String _summerLine =