[Koha-bugs] [Bug 32272] Last borrower and previous borrower display on moredetail.pl is broken

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

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32272

Andrew Fuerste-Henry <andrewfh at dubcolib.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #5 from Andrew Fuerste-Henry <andrewfh at dubcolib.org> ---
Patch doesn't apply:
Applying: Bug 32272: Restore last and previous borrowers on moredetail
Using index info to reconstruct a base tree...
M       koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
error: Failed to merge in the changes.
Patch failed at 0001 Bug 32272: Restore last and previous borrowers on
moredetail
[33mhint: Use 'git am --show-current-patch=diff' to see the failed patch[m
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-32272-Restore-last-and-previous-borrowers-on-m-ilGOtR.patch
Apply? [(y)es, (n)o, (i)nteractive]

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