Fix conflict

This commit is contained in:
sladecraven 2021-11-16 15:14:32 +01:00
commit afe05e6b26

View File

@ -43,7 +43,7 @@
"url": "https://gitlab.com/sasmira/swade-fr", "url": "https://gitlab.com/sasmira/swade-fr",
"flags": {}, "flags": {},
"version": "0.18.4.2", "version": "0.18.4.2",
"minimumCoreVersion": "0.7.9", "minimumCoreVersion": "0.8.0",
"compatibleCoreVersion": "1.0.0", "compatibleCoreVersion": "1.0.0",
"scripts": [], "scripts": [],
"esmodules": [ "esmodules": [
@ -79,8 +79,8 @@
], ],
"socket": false, "socket": false,
"manifest": "https://gitlab.com/sasmira/swade-fr/-/raw/master/module/module.json", "manifest": "https://gitlab.com/sasmira/swade-fr/-/raw/master/module/module.json",
"download": "https://gitlab.com/sasmira/swade-fr/-/jobs/artifacts/v0.18.4.1/raw/swade-fr.zip?job=build", "download": "https://gitlab.com/sasmira/swade-fr/-/jobs/artifacts/v0.18.4.2/raw/swade-fr.zip?job=build",
"protected": false, "protected": false,
"coreTranslation": false, "coreTranslation": false,
"library": false "library": false
} }