Bonjour, en voulant mettre le manager à jour vers la version 2.4.4 en suivant les manips dites plus haut je n'ai qu'une page blanche maintenant ...
voici l'intégralité des messages après avoir effectuées les commandes:
cd /var/www/seedbox-manager
git reset --hard HEAD
HEAD is now at a3d3f96 update boostrap
git pull origin master
p11-kit: invalid config filename, will be ignored in the future: /etc/pkcs11/modules/gnome-keyring-module
remote: Counting objects: 444, done.
remote: Total 444 (delta 25), reused 25 (delta 25), pack-reused 419
Receiving objects: 100% (444/444), 76.08 KiB, done.
Resolving deltas: 100% (217/217), completed with 17 local objects.
From https://github.com/Magicalex/seedbox-manager
* branch master -> FETCH_HEAD
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/notif-option.html
Auto-merging public/themes/spiritofbonobo/template/notif-admin.html
CONFLICT (add/add): Merge conflict in public/themes/spiritofbonobo/template/notif-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/administration.html
Auto-merging public/themes/default/template/notif-option.html
CONFLICT (add/add): Merge conflict in public/themes/default/template/notif-option.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
Auto-merging README.md
CONFLICT (content): Merge conflict in README.md
Automatic merge failed; fix conflicts and then commit the result.
composer update
Warning: This development build of composer is over 30 days old. It is recommended to update it by running "/usr/bin/composer self-update" to get the latest version.
[Seld\JsonLint\ParsingException]
"./composer.json" does not contain valid JSON
Parse error on line 3:
...nage your seedbox",<<<<<<< HEAD "re
---------------------^
Expected: 'STRING' - It appears you have an extra trailing comma
update [--prefer-source] [--prefer-dist] [--dry-run] [--dev] [--no-dev] [--lock] [--no-plugins] [--no-custom-installers] [--no-autoloader] [ --no-scripts] [--no-progress] [--with-dependencies] [-v|vv|vvv|--verbose] [-o|--optimize-autoloader] [--ignore-platform-reqs] [--prefer-stab le] [--prefer-lowest] [packages1] ... [packagesN]
/usr/bin/composer self-update
Updating to version 943107cfe717a74aa791f57b87fa514c88582b0d.
Downloading: 100%
Use composer self-update --rollback to return to version 6c971c302848a81a93dd626e53e8769dcd1ff4b7
composer update
[Seld\JsonLint\ParsingException]
"./composer.json" does not contain valid JSON
Parse error on line 3:
...nage your seedbox",<<<<<<< HEAD "re
---------------------^
Expected: 'STRING' - It appears you have an extra trailing comma
update [--prefer-source] [--prefer-dist] [--dry-run] [--dev] [--no-dev] [--lock] [--no-plugins] [--no-custom-installers] [--no-autoloader] [--no-scripts] [--no-progress] [--with-dependencies] [-v|vv|vvv|--verbose] [-o|--optimize-autoloader] [--ignore-platform-reqs] [--prefer-stable] [--prefer-lowest] [packages1] ... [packagesN]
bower update --allow-root
bower EMALFORMED Failed to read /var/www/seedbox-manager/bower.json
Additional error details:
Unexpected token <
merci d'avance pour votre aide