From beacdc70ab9431c40c1503c1cc8e1ef9e2ece459 Mon Sep 17 00:00:00 2001
From: Skies-Of-Blue <huhineedanemail@gmail.com>
Date: Tue, 11 Jun 2024 23:09:54 -0700
Subject: [PATCH] merge conflict be gone

---
 shiptest.dme | 1 +
 1 file changed, 1 insertion(+)

diff --git a/shiptest.dme b/shiptest.dme
index dd861f93ae5b..262fdbd6dee3 100644
--- a/shiptest.dme
+++ b/shiptest.dme
@@ -1964,6 +1964,7 @@
 #include "code\modules\clothing\ears\_ears.dm"
 #include "code\modules\clothing\factions\clip.dm"
 #include "code\modules\clothing\factions\gezena.dm"
+#include "code\modules\clothing\factions\hardliners.dm"
 #include "code\modules\clothing\factions\nanotrasen.dm"
 #include "code\modules\clothing\factions\ngr.dm"
 #include "code\modules\clothing\factions\suns.dm"