PnP/germandndcompendium
4
1
Fork 0
Code Pull Requests Actions Releases 4 Activity

Fix: merge conflict

Browse Source
This commit is contained in:
Julian Linn
2023-12-29 22:53:04 +00:00
parent 19e2709b5f
commit efbeec2d1f
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
module.json
View File

@@ -108,11 +108,6 @@
"system": "dnd5e", "system": "dnd5e",
"path": "packs/Subclass" "path": "packs/Subclass"
} }
<<<<<<< HEAD
], ],
"id": "SharedData_global" "id": "SharedData_global"
} }
=======
]
}
>>>>>>> 437464ddb1c200a3db307a78fbaf671763fc6015