From a1f814a44b9be75cdfa76df62f82415f03121db3 Mon Sep 17 00:00:00 2001
From: Atermonera <atermonera@gmail.com>
Date: Sat, 31 Aug 2019 14:09:10 -0800
Subject: [PATCH 1/2] Fixed air injectors

---
 code/ATMOSPHERICS/components/unary/outlet_injector.dm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/code/ATMOSPHERICS/components/unary/outlet_injector.dm b/code/ATMOSPHERICS/components/unary/outlet_injector.dm
index 61ace40879b..53348e317ed 100644
--- a/code/ATMOSPHERICS/components/unary/outlet_injector.dm
+++ b/code/ATMOSPHERICS/components/unary/outlet_injector.dm
@@ -174,4 +174,8 @@
 			"<span class='notice'>\The [user] unfastens \the [src].</span>", \
 			"<span class='notice'>You have unfastened \the [src].</span>", \
 			"You hear a ratchet.")
-		deconstruct()
\ No newline at end of file
+<<<<<<< HEAD
+		deconstruct()
+=======
+		deconstruct()
+>>>>>>> 6c61002... Merge pull request #6431 from Moltenkore/master

From f2545f75312dee95d43ea169ea91fbf70934ebf7 Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Sat, 31 Aug 2019 22:40:33 -0400
Subject: [PATCH 2/2] Update outlet_injector.dm

---
 code/ATMOSPHERICS/components/unary/outlet_injector.dm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/ATMOSPHERICS/components/unary/outlet_injector.dm b/code/ATMOSPHERICS/components/unary/outlet_injector.dm
index 53348e317ed..5e62fe58021 100644
--- a/code/ATMOSPHERICS/components/unary/outlet_injector.dm
+++ b/code/ATMOSPHERICS/components/unary/outlet_injector.dm
@@ -174,8 +174,4 @@
 			"<span class='notice'>\The [user] unfastens \the [src].</span>", \
 			"<span class='notice'>You have unfastened \the [src].</span>", \
 			"You hear a ratchet.")
-<<<<<<< HEAD
 		deconstruct()
-=======
-		deconstruct()
->>>>>>> 6c61002... Merge pull request #6431 from Moltenkore/master