cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-01-17 15:39:02 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed merge conflicts

Browse source
This commit is contained in:
WBHarry 2025-08-26 16:53:55 +02:00
parent abe2654352
commit fa6d7d3f3d
18 changed files with 0 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/packs/subclasses/subclass_Stalwart_rKRxFBlkbh9cDK8K.json
View file

@ -57,13 +57,8 @@
"systemId": "daggerheart",
"systemVersion": "1.1.0",
"createdTime": 1754245881893,
<<<<<<< HEAD
"modifiedTime": 1756034054824,
"lastModifiedBy": "vUIbuan0U50nfKBE"
=======
"modifiedTime": 1755943487549,
"lastModifiedBy": "tt3PwMBXcTLCtIQU"
>>>>>>> development
},
"_key": "!items!rKRxFBlkbh9cDK8K"
}