Merge brnch

2022-08-27 19:16:27 +02:00
parent d4f0cce62b 8c0fbf15b6
commit cfe8bee1c2
6 changed files with 96 additions and 38 deletions
--- a/system.json
+++ b/system.json
@@ -331,8 +331,14 @@
    }
  ],
  "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
  "gridDistance": 1,
  "gridUnits": "m",
  "primaryTokenAttribute": "sante.vie",