From f7cef1e52eefa32a2fad64cc3b98890242d0e481 Mon Sep 17 00:00:00 2001
From: Chi-Firka <ave830151@gmail.com>
Date: Sat, 14 Dec 2024 03:01:37 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D0=BA=D0=BE=D0=BD?=
 =?UTF-8?q?=D1=84=D0=BB=D0=B8=D0=BA=D1=82=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Prototypes/Entities/Objects/Misc/identification_cards.yml  | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
index 806eaf56be..cb0f78a7f1 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
@@ -834,9 +834,6 @@
     - CentralCommand
     - NuclearOperative
     - SyndicateAgent
-<<<<<<< Updated upstream
     - Wizard
-=======
   - type: NanoChatCard # Corvax-Next-PDAChat
     notificationsMuted: true
->>>>>>> Stashed changes