Фикс конфликта

superlowfpss · Dec 14, 2024 · f7cef1e · f7cef1e
1 parent aed4072
commit f7cef1e
Showing 1 changed file with 0 additions and 3 deletions.
diff --git 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