v0.0.4 (#4)

v0.0.4 merge fixes Co-Authored-By: erebus <erebus@rikspolisen.se> Co-Committed-By: erebus <erebus@rikspolisen.se>
2020-12-04 20:06:00 +00:00
parent c103fac27c
commit b771c7f088
4 changed files with 1 additions and 20 deletions
--- a/lang/en.json
+++ b/lang/en.json
@@ -72,7 +72,6 @@
    "MENU.SHOWROLLDIALOG": "Show diceroller dialog",
    "ROLL.OPENCLOSE": "Open / Close",
    "ROLL.EXCEPTIONAL": "Exceptional",
-<<<<<<< HEAD

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

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