Merge conflict fix

2020-12-04 20:49:58 +01:00
parent 1a24e7facf 2e389704ea
commit a496eca37f
4 changed files with 19 additions and 0 deletions
--- a/lang/en.json
+++ b/lang/en.json
@@ -72,6 +72,7 @@
    "MENU.SHOWROLLDIALOG": "Show diceroller dialog",
    "ROLL.OPENCLOSE": "Open / Close",
    "ROLL.EXCEPTIONAL": "Exceptional",
+<<<<<<< HEAD

    "SHIP.CARGO": "Cargo capacity",
    "SHIP.HULL": "Hull",
@@ -81,6 +82,8 @@
    "SHIP.CREW": "Crew",
    "SHIP.ARMAMENT": "Armament",
    "SHIP.RAMMINGDMG": "Ramming damage",
+=======
+>>>>>>> master

    "SKILL.TYPE": "Type",
    "SKILL.BASE": "Basic",