From b4cd9de3e4ccae89a648653ff70487c9e955a233 Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Sat, 27 May 2017 13:39:06 -0700 Subject: [PATCH] newline errors --- code/game/gamemodes/gang/gang_items.dm.rej | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 code/game/gamemodes/gang/gang_items.dm.rej diff --git a/code/game/gamemodes/gang/gang_items.dm.rej b/code/game/gamemodes/gang/gang_items.dm.rej deleted file mode 100644 index cdc0d35918..0000000000 --- a/code/game/gamemodes/gang/gang_items.dm.rej +++ /dev/null @@ -1,17 +0,0 @@ -diff a/code/game/gamemodes/gang/gang_items.dm b/code/game/gamemodes/gang/gang_items.dm (rejected hunks) -@@ -325,13 +325,13 @@ - user.put_in_hands(O) - if(spawn_msg) - to_chat(user, spawn_msg) -- -+ - /datum/gang_item/equipment/wetwork_boots - name = "Wetwork boots" - id = "wetwork" - cost = 20 - item_path = /obj/item/clothing/shoes/combat/gang -- -+ - /obj/item/clothing/shoes/combat/gang - name = "Wetwork boots" - desc = "A gang's best hitmen are prepared for anything."