From 91a1ee11bd4e94240e36e348907ad80540671dac Mon Sep 17 00:00:00 2001
From: "johnsonmt88@gmail.com"
 <johnsonmt88@gmail.com@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Fri, 15 Jun 2012 06:15:10 +0000
Subject: [PATCH] Apparently I didn't save the txt before committing it <.<

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3828 316c924e-a436-60f5-8080-3fe189b3f50e
---
 config/admins.txt | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/config/admins.txt b/config/admins.txt
index d02ce6a1bcc..a61086a22fd 100644
--- a/config/admins.txt
+++ b/config/admins.txt
@@ -1,6 +1,3 @@
-<<<<<<< .mine
-nodrak - Game Master
-carnwennan - Game Master=======
 quarxink - Game Master
 tle - Game Master
 xsi - Game Master
@@ -29,4 +26,6 @@ errorage - Game Master
 uhangi - Game Master
 superxpdude - Game Master
 petethegoat - Game Master
-korphaeron - Game Master>>>>>>> .r3825
+korphaeron - Game Master
+nodrak - Game Master
+carnwennan - Game Master
\ No newline at end of file