http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7264 delaye <stephane.delaye@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |stephane.delaye@biblibre.co | |m --- Comment #17 from delaye <stephane.delaye@biblibre.com> --- i tried to test this patch with sandbox system, it does not work, here is the result: Applying: Bug 7264 - Followup: Add a black border to the popup Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 7264 - Followup: Add a black border to the popup When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". Bug 7264 - Display information about library on OPAC detail [SIGNED-OFF] Bug 7264 - Followup: Add a black border to the popup Apply? [yn] Patch left in /tmp/SIGNED-OFF-Bug-7264---Followup-Add-a-black-border--6LJb4S.patch -- You are receiving this mail because: You are watching all bug changes.