Skip to content

Commit

Permalink
Merge remote-tracking branch 'naev/master' into cargo-overhaul
Browse files Browse the repository at this point in the history
  • Loading branch information
micahmumper committed Apr 26, 2016
2 parents b6c3402 + bdc90a7 commit 83e075b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion dat/assets/gorchenchev_shipyards.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<bar>The factional emblem of House Sirius is predominant in this spacedock bar. The owner of the station clearly wants to show that his allegiance to his faction is strong.</bar>
</general>
<tech>
<item>Soromid Military Ships</item>
<item>Sirius Military Ships</item>
<item>Basic Trade Ships</item>
<item>Bulk Trade Ships</item>
<item>Heavy Civilian Combat Ships</item>
Expand Down

0 comments on commit 83e075b

Please sign in to comment.