v0.0.4 (#4)

v0.0.4 merge fixes
Co-Authored-By: erebus <erebus@rikspolisen.se>
Co-Committed-By: erebus <erebus@rikspolisen.se>

system.json

@@ -2,13 +2,9 @@
     "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",
+    "compatibleCoreVersion": "0.7.8",
     "templateVersion": 4,
     "author": "Erebus",
     "scripts": [],
@@ -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
 }