https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15775
Caroline Cyr La Rose <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |caroline.cyr-la-rose@inlibr | |o.com Status|Needs Signoff |Patch doesn't apply --- Comment #19 from Caroline Cyr La Rose <[email protected]> --- 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. _______________________________________________ Koha-bugs mailing list [email protected] http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
