how did I miss that. Derp

This commit is contained in:
Fox-McCloud
2016-09-05 18:33:03 -04:00
parent cffd88ee8a
commit 521fba608d
-1
View File
@@ -118,7 +118,6 @@
name = "data disk - 'God Emperor of Mankind'"
read_only = 1
<<<<<<< HEAD
/obj/item/weapon/disk/data/demo/New()
Initialize()
buf.types=DNA2_BUF_UE|DNA2_BUF_UI