fix: merge conflict header
This commit is contained in:
parent
47206a8695
commit
40b9d3a053
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user