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",

module/items/item-sheet.js

@@ -94,7 +94,6 @@ export class ItemSheetKH extends ItemSheet {
                         skillList.push(item)
                     }
                 }
-<<<<<<< HEAD
                 this.position.width = 450;
                 this.position.height = 605;
                 break;
@@ -127,8 +126,6 @@ export class ItemSheetKH extends ItemSheet {
                 this.position.width = 405;
                 this.position.height = 570;
                 break;
-=======
->>>>>>> master
             default:
                 this.position.width = 450;
                 this.position.height = 605;

styles/items.css

@@ -102,12 +102,8 @@
 .items .items-list .item-weapon,
 .items .items-list .item-skill,
 .items .items-list .item-nor,
-<<<<<<< HEAD
 .items .items-list .item-defence,
 .items .items-list .item-attack {
-=======
-.items .items-list .item-defence {
->>>>>>> master
     line-height: 24px;
     padding: 3px 0;
     border-bottom: 1px solid #bbb;

system.json

@@ -2,11 +2,7 @@
     "name": "kopparhavet",
     "title": "Kopparhavets Hjältar",
     "description": "The Molten Sea is a dangerous but exciting place, where pirates, sorcerers and secretive orders of knighthood struggle for power, wealth and ancient lore.",
-<<<<<<< HEAD
     "version": "0.0.4",
-=======
-    "version": "0.0.3",
->>>>>>> master
     "minimumCoreVersion": "0.7.5",
     "compatibleCoreVersion": "0.7.7",
     "templateVersion": 4,
@@ -85,11 +81,6 @@
     "url": "https://pi.rikspolisen.se/foundryvtt/kopparhavet",
     "socket": true,
     "manifest": "https://pi.rikspolisen.se/foundryvtt/kopparhavet/raw/branch/master/system.json",
-<<<<<<< HEAD
     "download": "https://pi.rikspolisen.se/foundryvtt/kopparhavet/archive/v0.0.4.zip",
     "license": "LICENCE.txt"
-=======
-    "download": "https://pi.rikspolisen.se/foundryvtt/kopparhavet/archive/v0.0.3.zip",
-    "license": ""
->>>>>>> master
 }