Delete tgstation.dme.rej

This commit is contained in:
LetterJay
2017-06-19 20:54:20 -05:00
committed by GitHub
parent cd06b77e01
commit fa9c2aaa15

View File

@@ -1,9 +0,0 @@
diff a/tgstation.dme b/tgstation.dme (rejected hunks)
@@ -1150,6 +1151,7 @@
#include "code\modules\client\preferences.dm"
#include "code\modules\client\preferences_savefile.dm"
#include "code\modules\client\preferences_toggles.dm"
+#include "code\modules\client\verbs\etips.dm"
#include "code\modules\client\verbs\ooc.dm"
#include "code\modules\client\verbs\ping.dm"
#include "code\modules\client\verbs\sethotkeys.dm"