Merge VK mods
This commit is contained in:
10
system.json
10
system.json
@ -34,7 +34,7 @@
|
||||
],
|
||||
"url": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/",
|
||||
"license": "LICENSE.txt",
|
||||
"version": "10.0.6",
|
||||
"version": "10.0.7",
|
||||
"compatibility": {
|
||||
"minimum": "10"
|
||||
},
|
||||
@ -331,14 +331,8 @@
|
||||
}
|
||||
],
|
||||
"socket": true,
|
||||
<<<<<<< HEAD
|
||||
"manifest": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/raw/v10/system.json",
|
||||
"download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-10.0.6.zip",
|
||||
=======
|
||||
"manifest": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/raw/v1.5/system.json",
|
||||
"download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-1.5.86.zip",
|
||||
"protected": false,
|
||||
>>>>>>> origin/v1.5
|
||||
"download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-10.0.7.zip",
|
||||
"gridDistance": 1,
|
||||
"gridUnits": "m",
|
||||
"primaryTokenAttribute": "sante.vie",
|
||||
|
Reference in New Issue
Block a user