fix: merge conflict header

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

View File

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