From ff39fee4f01acf2fffe3b82f80e4e4a531e3e27c Mon Sep 17 00:00:00 2001
From: SomeGuyEatingPie <seandavidjohnson132@gmail.com>
Date: Thu, 11 Aug 2022 14:10:39 +0100
Subject: [PATCH] Fix to merge

Quick fix to let me merge commits to bring branch up to date
---
 tgstation.dme | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tgstation.dme b/tgstation.dme
index 6f1afdd7..c3a9558e 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -3072,7 +3072,6 @@
 #include "GainStation13\code\modules\reagents\chemistry\recipes\fatchem.dm"
 #include "GainStation13\code\modules\vending\mealdor.dm"
 #include "GainStation13\code\obj\fatray.dm"
-#include "GainStation13\code\obj\structure\scale.dm"
 #include "hyperstation\code\__DEFINES\economy.dm"
 #include "hyperstation\code\__DEFINES\wendigo.dm"
 #include "hyperstation\code\controllers\subsystem\economy.dm"