https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15595 Victor Grousset/tuxayo <victor.grousset@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |victor.grousset@biblibre.co | |m --- Comment #3 from Victor Grousset/tuxayo <victor.grousset@biblibre.com> --- conflict: ~/d/koha ❯❯❯ git bz apply 15595 Bug 15595 - Display Google Jacket image on staff client search list and detail page 70721 - Bug-15595: Google cover staff search and detail Apply? [(y)es, (n)o, (i)nteractive] y Application de Bug-15595: Google cover staff search and detail .git/rebase-apply/patch:45: trailing whitespace. warning: 1 ligne a ajouté des erreurs d'espace. Utilisation de l'information de l'index pour reconstruire un arbre de base... M installer/data/mysql/sysprefs.sql M koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt M koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt .git/rebase-apply/patch:45: trailing whitespace. warning: 1 line applied after fixing whitespace errors. Retour à un patch de la base et fusion à 3 points... Fusion automatique de koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt CONFLIT (contenu) : Conflit de fusion dans koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt Fusion automatique de koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt CONFLIT (contenu) : Conflit de fusion dans koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt Fusion automatique de installer/data/mysql/sysprefs.sql error: Échec d'intégration des modifications. le patch a échoué à 0001 Bug-15595: Google cover staff search and detail La copie du patch qui a échoué se trouve dans : .git/rebase-apply/patch When you have resolved this problem run "git bz apply --continue". If you would prefer to skip this patch, instead run "git bz apply --skip". To restore the original branch and stop patching run "git bz apply --abort". Patch left in /tmp/Bug-15595-Google-cover-staff-search-and-detail-YnkBAW.patch -- You are receiving this mail because: You are the assignee for the bug. You are watching all bug changes.