Update tortuga.yml

Signed-off-by: GeneralGaws <[email protected]>
EndrAnimet · Dec 14, 2024 · b66fc91 · b66fc91
1 parent bcc4ea6
commit b66fc91
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/Resources/Prototypes/Maps/tortuga.yml b/Resources/Prototypes/Maps/tortuga.yml
@@ -74,13 +74,8 @@
             ForensicMantis: [ 1, 1 ]
             ResearchAssistant: [ 2, 4 ]
             ResearchDirector: [ 1, 1 ]
-<<<<<<< HEAD
             Scientist: [ 5, 6 ]
             Roboticist: [ 1, 1 ]
-=======
-            Roboticist: [ 1, 2 ]
-            Scientist: [ 4, 5 ]
->>>>>>> 49d67314dba867c001b38e45073381ad66851c39
           #supply
             CargoTechnician: [ 2, 4 ]
             Courier: [ 2, 2 ]