merge conflicts

pull/7/head
Erebus 2021-07-28 13:07:29 +02:00
commit 662d015afd
1 changed files with 1 additions and 1 deletions

View File

@ -95,6 +95,6 @@
"url": "https://pi.rikspolisen.se/foundryvtt/kopparhavet", "url": "https://pi.rikspolisen.se/foundryvtt/kopparhavet",
"socket": true, "socket": true,
"manifest": "https://pi.rikspolisen.se/foundryvtt/kopparhavet/raw/branch/master/system.json", "manifest": "https://pi.rikspolisen.se/foundryvtt/kopparhavet/raw/branch/master/system.json",
"download": "https://pi.rikspolisen.se/foundryvtt/kopparhavet/archive/v0.0.5.zip", "download": "https://pi.rikspolisen.se/foundryvtt/kopparhavet/archive/v0.0.6.zip",
"license": "LICENCE.txt" "license": "LICENCE.txt"
} }