From 32e97ebda2fa0e786a147db12749d03cc26f1bbf Mon Sep 17 00:00:00 2001
From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Date: Tue, 14 Mar 2023 17:59:20 +1000
Subject: [PATCH] Update mre.dm

---
 code/game/objects/items/weapons/storage/mre.dm | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/code/game/objects/items/weapons/storage/mre.dm b/code/game/objects/items/weapons/storage/mre.dm
index cdbd6ed884..aa1a334387 100644
--- a/code/game/objects/items/weapons/storage/mre.dm
+++ b/code/game/objects/items/weapons/storage/mre.dm
@@ -234,15 +234,9 @@ MRE Stuff
 /obj/item/weapon/storage/mrebag/attack_self(mob/user)
 	open(user)
 
-<<<<<<< HEAD
 /obj/item/weapon/storage/mrebag/open(mob/user)
 	if(!opened && !isobserver(user))
-		to_chat(usr, "<span class='notice'>The pouch heats up as you break the vaccum seal.</span>")
-=======
-/obj/item/storage/mrebag/open(mob/user)
-	if(!opened)
 		to_chat(usr, "<span class='notice'>The pouch heats up as you break the vacuum seal.</span>")
->>>>>>> 01d7833f135... Merge pull request #9031 from Verkister/patch-102
 		opened = 1
 		update_icon()
 	. = ..()