From a7fe91204632bad7c28929d046c8241c4ded3d08 Mon Sep 17 00:00:00 2001
From: VividPups <68whiskty@gmail.com>
Date: Thu, 6 Feb 2025 18:17:22 -0600
Subject: [PATCH] erga

argag
---
 Resources/Prototypes/Floof/Loadouts/uniform.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Resources/Prototypes/Floof/Loadouts/uniform.yml b/Resources/Prototypes/Floof/Loadouts/uniform.yml
index 6bf0633ce0..9c1a539b6a 100644
--- a/Resources/Prototypes/Floof/Loadouts/uniform.yml
+++ b/Resources/Prototypes/Floof/Loadouts/uniform.yml
@@ -189,5 +189,3 @@
     - !type:CharacterItemGroupRequirement
       group: LoadoutUniformsCivilian2
 
-
-#would this help me find the Merge CONFLICT?