From e1e86ee7029a88a8cc3bd23308d36c77f70ec0d5 Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Mon, 27 Sep 2021 17:50:28 -0400
Subject: [PATCH] powder that makes you say yes

---
 code/game/machinery/doors/airlock.dm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 0c3d0dc978..286efd4345 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 //VOREStation Edit - Redone a lot of airlock things:
 /*
 - Specific department maintenance doors