cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-03-07 22:46:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix conflicts again

Browse source
This commit is contained in:
Dapoolp 2025-07-01 19:02:54 +02:00
parent 1fff74d098
commit 9f88cdade8
2 changed files with 0 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
module/documents/actor.mjs
View file

@ -1,12 +1,8 @@
import DamageSelectionDialog from '../applications/damageSelectionDialog.mjs';
import { GMUpdateEvent, socketEvent } from '../helpers/socket.mjs';
import DamageReductionDialog from '../applications/damageReductionDialog.mjs';
<<<<<<< HEAD
import Resources from '../applications/resources.mjs';
=======
import { LevelOptionType } from '../data/levelTier.mjs';
import DHFeature from '../data/item/feature.mjs';
>>>>>>> main
export default class DhpActor extends Actor {
async _preCreate(data, options, user) {