1
0
Fork 0
mirror of https://github.com/YunoHost/apps.git synced 2024-09-03 20:06:07 +02:00

Fix conflict

This commit is contained in:
Maniack Crudelis 2018-01-23 00:19:44 +01:00 committed by GitHub
parent 042ade8405
commit b31d6065d2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -918,11 +918,12 @@
"state": "notworking",
"url": "https://github.com/YunoHost-Apps/pluxml_ynh"
},
"Portainer": {
"portainer": {
"branch": "master",
"revision": "a7e7e2faa5bc21bd2c2685c958375a05d9ccf70b",
"state": "inprogress",
"url": "https://github.com/aymhce/portainer_ynh"
},
"prestashop": {
"branch": "master",
"revision": "34b6f2e2f33c528a411a5c1690ad7124c68bb6da",