Update edge.yml

Signed-off-by: GeneralGaws <[email protected]>
EndrAnimet · Dec 14, 2024 · 2e1d6f3 · 2e1d6f3
1 parent b66fc91
commit 2e1d6f3
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/Resources/Prototypes/Maps/edge.yml b/Resources/Prototypes/Maps/edge.yml
@@ -58,11 +58,7 @@
             Chaplain: [ 1, 1 ]
             ForensicMantis: [ 1, 1 ]
             Scientist: [ 2, 3 ]
-<<<<<<< HEAD
             ResearchAssistant: [ 2, 4 ]
-=======
-            ResearchAssistant: [ 2, 3 ]
->>>>>>> 49d67314dba867c001b38e45073381ad66851c39
             Borg: [ 2, 2 ]
             Roboticist: [ 1, 1 ]
           #security