From 6aecbcd4c29a6b38c7ca33b7dbe0cbc7ff92981a Mon Sep 17 00:00:00 2001
From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Date: Mon, 13 Mar 2023 15:11:06 +1000
Subject: [PATCH] Update reagent_tank.dm

---
 .../reagents/machinery/dispenser/reagent_tank.dm   | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/code/modules/reagents/machinery/dispenser/reagent_tank.dm b/code/modules/reagents/machinery/dispenser/reagent_tank.dm
index cf2d5570818..df1af4cfd85 100644
--- a/code/modules/reagents/machinery/dispenser/reagent_tank.dm
+++ b/code/modules/reagents/machinery/dispenser/reagent_tank.dm
@@ -492,17 +492,3 @@
 	reagents.splash_area(get_turf(src), 3)
 	visible_message(span("danger", "The [src] bursts open, spreading oil all over the area."))
 	qdel(src)
-<<<<<<< HEAD
-=======
-
-/obj/structure/reagent_dispensers/he3
-	name = "fueltank"
-	desc = "A fueltank."
-	icon = 'icons/obj/objects.dmi'
-	icon_state = "weldtank"
-	amount_per_transfer_from_this = 10
-
-/obj/structure/reagent_dispensers/he3/Initialize()
-	. = ..()
-	reagents.add_reagent("helium3",1000)
->>>>>>> 69ba99b5e6e... /tg/ era language pass (#8962)