From 5950b05b6b25e7e46b478903f62d9740fe425d4f Mon Sep 17 00:00:00 2001
From: Zekins <136648667+Zekins3366@users.noreply.github.com>
Date: Thu, 18 Apr 2024 19:06:13 +0300
Subject: [PATCH] Update canister.yml

---
 Resources/Prototypes/_NF/Shipyard/canister.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Resources/Prototypes/_NF/Shipyard/canister.yml b/Resources/Prototypes/_NF/Shipyard/canister.yml
index c8d68b2403b..54834af7380 100644
--- a/Resources/Prototypes/_NF/Shipyard/canister.yml
+++ b/Resources/Prototypes/_NF/Shipyard/canister.yml
@@ -27,6 +27,4 @@
             prefixCreator: '14'
         - type: StationJobs
           overflowJobs: []
-<<<<<<< HEAD
           availableJobs: {}
-=======