Bonjour,
j'ai voulu mettre à jour seedbox manager mais j'ai visiblement un soucis.
J'ai fait un
git pull
et voici le résultat :
remote: Counting objects: 443, done.
remote: Compressing objects: 100% (77/77), done.
remote: Total 443 (delta 26), reused 8 (delta 1), pack-reused 365
Receiving objects: 100% (443/443), 84.01 KiB | 0 bytes/s, done.
Resolving deltas: 100% (195/195), completed with 1 local objects.
From https://github.com/Magicalex/seedbox-manager
+ a3d3f96...78d9348 master -> origin/master (forced update)
* [new tag] v2.4.4 -> v2.4.4
Auto-merging version.json
CONFLICT (add/add): Merge conflict in version.json
Auto-merging public/themes/spiritofbonobo/template/notif-option.html
CONFLICT (add/add): Merge conflict in public/themes/spiritofbonobo/template/noti f-option.html
Auto-merging public/themes/spiritofbonobo/template/notif-admin.html
CONFLICT (add/add): Merge conflict in public/themes/spiritofbonobo/template/noti f-admin.html
Auto-merging public/themes/spiritofbonobo/template/bloc-support-user.html
CONFLICT (add/add): Merge conflict in public/themes/spiritofbonobo/template/bloc -support-user.html
Auto-merging public/themes/spiritofbonobo/option.html
CONFLICT (add/add): Merge conflict in public/themes/spiritofbonobo/option.html
Auto-merging public/themes/spiritofbonobo/administration.html
CONFLICT (add/add): Merge conflict in public/themes/spiritofbonobo/administratio n.html
Auto-merging public/themes/default/template/notif-option.html
CONFLICT (add/add): Merge conflict in public/themes/default/template/notif-optio n.html
Auto-merging public/themes/default/template/notif-admin.html
CONFLICT (add/add): Merge conflict in public/themes/default/template/notif-admin .html
Auto-merging public/themes/default/option.html
CONFLICT (add/add): Merge conflict in public/themes/default/option.html
Auto-merging public/themes/default/administration.html
CONFLICT (add/add): Merge conflict in public/themes/default/administration.html
Auto-merging public/install/installation.php
CONFLICT (add/add): Merge conflict in public/install/installation.php
Auto-merging public/index.php
CONFLICT (add/add): Merge conflict in public/index.php
Auto-merging composer.json
CONFLICT (add/add): Merge conflict in composer.json
Auto-merging bower.json
CONFLICT (add/add): Merge conflict in bower.json
Auto-merging app/downloads.php
CONFLICT (add/add): Merge conflict in app/downloads.php
Auto-merging app/Lib/Users.php
CONFLICT (add/add): Merge conflict in app/Lib/Users.php
Auto-merging app/Lib/Support.php
CONFLICT (add/add): Merge conflict in app/Lib/Support.php
Auto-merging app/Lib/Server.php
CONFLICT (add/add): Merge conflict in app/Lib/Server.php
Auto-merging app/Lib/Install.php
CONFLICT (add/add): Merge conflict in app/Lib/Install.php
Automatic merge failed; fix conflicts and then commit the result.
et j'ai tenté un
bower update --allow-root
bower EMALFORMED Failed to read /var/www/seedbox-manager/bower.json
Additional error details:
Unexpected token <