From 725634c9ea8ba9e02cda64d8bdad0d832ae0892d Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Sun, 6 May 2018 03:09:47 -0400
Subject: [PATCH] Update material_container.dm

---
 code/datums/components/material_container.dm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/datums/components/material_container.dm b/code/datums/components/material_container.dm
index c819bd2f78..500e51dccb 100644
--- a/code/datums/components/material_container.dm
+++ b/code/datums/components/material_container.dm
@@ -53,11 +53,7 @@
 	var/list/tc = allowed_typecache
 	if(user.a_intent != INTENT_HELP)
 		return
-<<<<<<< HEAD
-	if((I.flags_2 & (HOLOGRAM_2 | NO_MAT_REDEMPTION_2)) || (tc && !is_type_in_typecache(I, tc)))
-=======
 	if((I.flags_1 & HOLOGRAM_1) || (I.item_flags & NO_MAT_REDEMPTION) || (tc && !is_type_in_typecache(I, tc)))
->>>>>>> fd4c753... replaces BANG_PROTECT_2 with a component, also kills OMNITONGUE_2 and flags_2  (#37597)
 		to_chat(user, "<span class='warning'>[parent] won't accept [I]!</span>")
 		return
 	. = COMPONENT_NO_AFTERATTACK