v0.0.4 merge fixes

pull/4/head
Erebus 2020-12-04 21:05:06 +01:00
commit 43d4634e97
2 changed files with 0 additions and 6 deletions

View File

@ -94,7 +94,6 @@ export class ItemSheetKH extends ItemSheet {
skillList.push(item) skillList.push(item)
} }
} }
this.position.width = 450; this.position.width = 450;
this.position.height = 605; this.position.height = 605;
break; break;

View File

@ -81,11 +81,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",
<<<<<<< HEAD
"download": "https://pi.rikspolisen.se/foundryvtt/kopparhavet/archive/v0.0.4.zip", "download": "https://pi.rikspolisen.se/foundryvtt/kopparhavet/archive/v0.0.4.zip",
"license": "LICENCE.txt" "license": "LICENCE.txt"
=======
"download": "https://pi.rikspolisen.se/foundryvtt/kopparhavet/archive/v0.0.3.zip",
"license": ""
>>>>>>> master
} }