Update canister.yml

Corvax-Frontier · Apr 18, 2024 · 5950b05 · 5950b05
1 parent 46bb574
commit 5950b05
Showing 1 changed file with 0 additions and 2 deletions.
diff --git 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: {}
-=======