From d200bff9f4876692effbe35849539bd53f6db212 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Mon, 22 May 2017 11:26:47 -0500
Subject: [PATCH] spaces. spaces caused the file to conflict.

---
 code/game/gamemodes/gang/gang_items.dm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/game/gamemodes/gang/gang_items.dm b/code/game/gamemodes/gang/gang_items.dm
index d71a06a190..b5237040f1 100644
--- a/code/game/gamemodes/gang/gang_items.dm
+++ b/code/game/gamemodes/gang/gang_items.dm
@@ -237,6 +237,7 @@
 	item_path = /obj/item/ammo_box/magazine/uzim9mm
 
 
+
 ///////////////////
 //EQUIPMENT
 ///////////////////