mirror of
https://github.com/Foundryborne/daggerheart.git
synced 2026-01-18 07:59:03 +01:00
Fix conflicts
This commit is contained in:
commit
92a0883806
121 changed files with 1526 additions and 1107 deletions
|
|
@ -127,8 +127,8 @@ export default class DHActorRoll extends foundry.abstract.TypeDataModel {
|
|||
}
|
||||
|
||||
this.canViewSecret = this.parent.speakerActor?.testUserPermission(game.user, 'OBSERVER');
|
||||
this.canButtonApply = game.user.isGM;
|
||||
this.isGM = game.user.isGM;
|
||||
this.canButtonApply = game.user.isGM; //temp
|
||||
this.isGM = game.user.isGM; //temp
|
||||
}
|
||||
|
||||
getTargetList() {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue