From 95a192807d122cc0c6555e571027018079820a97 Mon Sep 17 00:00:00 2001
From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com>
Date: Fri, 3 May 2024 16:21:52 +0300
Subject: [PATCH] Update empress.yml

---
 Resources/Prototypes/_NF/Shipyard/Nfsd/empress.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/empress.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/empress.yml
index f7c1d297d8a..fa266144d43 100644
--- a/Resources/Prototypes/_NF/Shipyard/Nfsd/empress.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/empress.yml
@@ -1,14 +1,8 @@
 - type: vessel
   id: Empress
-<<<<<<< HEAD:Resources/Prototypes/_NF/Shipyard/Security/empress.yml
   name: NSF Императрица
   description: Крупногабаритный патрульшый шаттл ДСБФ. Рекомендованный состав команды 4-8 человек.
-  price: 170000 #Appraisal value is 173000
-=======
-  name: NSF Empress
-  description: A large patrol vessel capable of carrying up to 3 smaller faster attack ships. the flagship vessel of the nfsd.
   price: 170000 #Appraisal value is 150000
->>>>>>> upstream/master:Resources/Prototypes/_NF/Shipyard/Nfsd/empress.yml
   category: Large
   group: Security
   shuttlePath: /Maps/_NF/Shuttles/Nfsd/empress.yml