From d5cca4897aab57f3c766a60657b2f1f2815d25f5 Mon Sep 17 00:00:00 2001
From: keronshb <keronshb@live.com>
Date: Sat, 7 Mar 2020 23:18:03 -0400
Subject: [PATCH] Fixed conflict?

I think this SHOULD be it...
---
 tgstation.dme | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tgstation.dme b/tgstation.dme
index 7ea7574fb8..5d2e5a02ad 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -153,6 +153,7 @@
 #include "code\__HELPERS\text_vr.dm"
 #include "code\__HELPERS\time.dm"
 #include "code\__HELPERS\type2type.dm"
+#include "code\__HELPERS\type2type_vr.dm"
 #include "code\__HELPERS\typelists.dm"
 #include "code\__HELPERS\unsorted.dm"
 #include "code\__HELPERS\vector.dm"