https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=22322
David Nind <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #17 from David Nind <[email protected]> --- The patches no longer apply 8-(... git bz apply 22322 Bug 22322 - Self-checkin module should provide for automatic logins (like self-checkout) 161722 - Bug 22322: Self check-in without log in 161723 - Bug 22322: Fix QA issues Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 22322: Self check-in without log in Using index info to reconstruct a base tree... M koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt M opac/sco/sco-main.pl Falling back to patching base and 3-way merge... Auto-merging opac/sco/sco-main.pl CONFLICT (content): Merge conflict in opac/sco/sco-main.pl Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt error: Failed to merge in the changes. Patch failed at 0001 Bug 22322: Self check-in without log in -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] https://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/
