v0.0.4 merge fixes
commit
43d4634e97
|
@ -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;
|
||||||
|
|
|
@ -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
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue