From fa6ec29be61e65c515b543c2791f2d7a572f05f3 Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Tue, 20 Jul 2021 21:14:45 -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 aa7795e7e7..c3d8e4ed0f 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