foundryvtt/kopparhavet
1
0
Fork 0
Code Issues Pull Requests Projects Releases 10 Wiki Activity

v0.0.4 (#4)

Browse Source 
v0.0.4 merge fixes
Co-Authored-By: erebus <erebus@rikspolisen.se>
Co-Committed-By: erebus <erebus@rikspolisen.se>
This commit was merged in pull request #4.
This commit is contained in:
erebus
2020-12-04 20:06:00 +00:00
parent c103fac27c
commit b771c7f088
4 changed files with 1 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
module/items/item-sheet.js
View File

@@ -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;