uberwald/fvtt-never-stop-blowing-up
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix: merge conflict header

Browse Source
This commit is contained in:
Joscha Maier 2024-12-03 13:15:56 +01:00
parent 47206a8695
commit 40b9d3a053
No known key found for this signature in database
GPG Key ID: 8C4D045D84A30ABA
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
system.json
View File

@ -2,11 +2,7 @@
"id": "kidsonbrooms", "id": "kidsonbrooms",
"title": "Kids on Brooms System", "title": "Kids on Brooms System",
"description": "The Kids on Brooms system for FoundryVTT!", "description": "The Kids on Brooms system for FoundryVTT!",
<<<<<<< HEAD
"version": "1.1.6", "version": "1.1.6",
=======
"version": "1.1.5",
>>>>>>> master
"compatibility": { "compatibility": {
"minimum": 12, "minimum": 12,
"verified": 12.331 "verified": 12.331