[Koha-bugs] [Bug 15775] User should know when they are blocked from checkouts on OPAC + Translatability fixes for OPAC Summary page

bugzilla-daemon at bugs.koha-community.org bugzilla-daemon at bugs.koha-community.org
Fri Sep 22 20:58:28 CEST 2017


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

Caroline Cyr La Rose <caroline.cyr-la-rose at inlibro.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |caroline.cyr-la-rose at inlibr
                   |                            |o.com
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #19 from Caroline Cyr La Rose <caroline.cyr-la-rose at inlibro.com> ---
Hi, I tried applying the patch, but it doesn't seem to work. I get conflicts...

Using index info to reconstruct a base tree...
M       koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
M       opac/opac-user.pl
Falling back to patching base and 3-way merge...
Auto-merging opac/opac-user.pl
CONFLICT (content): Merge conflict in opac/opac-user.pl
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
CONFLICT (content): Merge conflict in
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
Failed to merge in the changes.
Patch failed at 0001 Bug 15775 - User should know when they are blocked from
checkouts on OPAC + Translatability fixes for OPAC Summary page

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


More information about the Koha-bugs mailing list