From 60717d65efcbda0ec07ce68497b009ea2af34128 Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Tue, 20 Jul 2021 18:55:42 -0400
Subject: [PATCH] powder that makes you say yes

---
 code/controllers/configuration.dm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm
index d162cc3616..7ddfc9e088 100644
--- a/code/controllers/configuration.dm
+++ b/code/controllers/configuration.dm
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 var/list/gamemode_cache = list()
 
 /datum/configuration