From 990c5673a14cbb525ea0d42fc5b68a61ebd0d314 Mon Sep 17 00:00:00 2001
From: CodeForFame <CodeForFame@gmail.com>
Date: Fri, 24 Jun 2011 16:58:42 -0500
Subject: [PATCH] Fixed from merge.

---
 GameServer/alert-config.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/GameServer/alert-config.xml b/GameServer/alert-config.xml
index 5202c42..846732b 100644
--- a/GameServer/alert-config.xml
+++ b/GameServer/alert-config.xml
@@ -22,9 +22,4 @@
 			<priority>1</priority>
 		</email>
 	</user>
-<<<<<<< HEAD
 </alert>
-
-=======
-</alert>
->>>>>>> upstream/master