Skip to content

Commit

Permalink
Fix merge conflict properly this time
Browse files Browse the repository at this point in the history
  • Loading branch information
TsjipTsjip committed Jan 25, 2024
1 parent 70d3234 commit 2fb2e01
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions Resources/Prototypes/_NF/Maps/Outpost/frontier.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,7 @@
availableJobs:
Passenger: [ -1, -1 ]
HeadOfPersonnel: [ 1, 1 ]
HeadOfSecurity: [ 1, 1 ]
SecurityGuard: [ 1, 1 ]
SeniorOfficer: [ 0, 0 ]
Brigmedic: [ 0, 0 ]
SecurityOfficer: [ 0, 0 ]
SecurityCadet: [ 0, 0 ]
StationTrafficController: [ 1, 1 ]
Valet: [ 1, 1 ]
Janitor: [ 1, 1 ]
Expand Down

0 comments on commit 2fb2e01

Please sign in to comment.