v0.0.4 fixes

2020-12-04 21:01:28 +01:00
parent a496eca37f
commit e631883a44
4 changed files with 2 additions and 15 deletions
--- a/module/items/item-sheet.js
+++ b/module/items/item-sheet.js
@@ -94,7 +94,7 @@ export class ItemSheetKH extends ItemSheet {
                        skillList.push(item)
                    }
                }
-<<<<<<< HEAD
+
                this.position.width = 450;
                this.position.height = 605;
                break;
@@ -127,8 +127,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;