[Koha-bugs] [Bug 7264] Display information about library on OPAC detail

[bugzilla-daemon at bugs.koha-community.org]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7264

--- Comment #21 from delaye <stephane.delaye at biblibre.com> ---
I use a sandbox to test patches.
In 7264 i changed the order of the patch then I started applying the patches
but I have this new message:

Applying: bug_7264: Branch popup
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging C4/Items.pm
CONFLICT (content): Merge conflict in C4/Items.pm
Auto-merging koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
Auto-merging opac/opac-detail.pl
Failed to merge in the changes.
Patch failed at 0001 bug_7264: Branch 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

patch
Apply? [yn]
Patch left in /tmp/patch-IjIQ5k.patch

-- 
You are receiving this mail because:
You are watching all bug changes.