Merge conflict fix

2020-12-04 20:49:58 +01:00
parent 1a24e7facf 2e389704ea
commit a496eca37f
4 changed files with 19 additions and 0 deletions
--- a/module/items/item-sheet.js
+++ b/module/items/item-sheet.js
@@ -94,6 +94,7 @@ export class ItemSheetKH extends ItemSheet {
                        skillList.push(item)
                    }
                }
+<<<<<<< HEAD
                this.position.width = 450;
                this.position.height = 605;
                break;
@@ -126,6 +127,8 @@ export class ItemSheetKH extends ItemSheet {
                this.position.width = 405;
                this.position.height = 570;
                break;
+=======
+>>>>>>> master
            default:
                this.position.width = 450;
                this.position.height = 605;