Skip to content

Commit

Permalink
Fixed merge conflicts again (something broke the first time)
Browse files Browse the repository at this point in the history
  • Loading branch information
Nox38 committed Feb 10, 2025
1 parent 5b45600 commit b8544d0
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
recipes:
- BorgModuleCable
- BorgModuleFireExtinguisher
- BorgModuleRadiationDetection
- BorgModuleTool

- type: latheRecipePack
Expand All @@ -38,13 +37,8 @@
recipes:
- BorgModuleAdvancedCleaning
- BorgModuleAdvancedTool
- BorgModuleGPS
- BorgModuleArtifact
- BorgModuleAnomaly
- BorgModuleGardening
- BorgModuleHarvesting
- BorgModuleDefibrillator
- BorgModuleAdvancedTreatment
- BorgModuleAdvancedChemical
- BorgModuleAdvancedMining

- type: latheRecipePack
id: MechParts
Expand Down

0 comments on commit b8544d0

Please sign in to comment.