cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-30 07:27:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Apparently I didn't save the txt before committing it <.<

Browse Source 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3828 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
johnsonmt88@gmail.com
2012-06-15 06:15:10 +00:00
parent 1b6b13b6b4
commit 91a1ee11bd
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/admins.txt
+3 -4
View File
@@ -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