Skip to content

Commit

Permalink
remove usage of deprecated globalThis.mergeObject
Browse files Browse the repository at this point in the history
  • Loading branch information
Muttley committed Sep 8, 2024
1 parent 0dc9818 commit 5dbb402
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion system/src/sheets/actors/JcomAdventurerSheet.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export default class JcomAventurerSheet extends JcomActorBaseSheet {

/** @override */
static get defaultOptions() {
return mergeObject(super.defaultOptions, {
return foundry.utils.mergeObject(super.defaultOptions, {
width: 720,
height: 780,
});
Expand Down
2 changes: 1 addition & 1 deletion system/src/sheets/actors/JcomEnemySheet.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export default class JcomEnemySheet extends JcomActorBaseSheet {

/** @override */
static get defaultOptions() {
return mergeObject(super.defaultOptions, {
return foundry.utils.mergeObject(super.defaultOptions, {
width: 720,
height: 780,
});
Expand Down

0 comments on commit 5dbb402

Please sign in to comment.