https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=31503
David Nind <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] Status|Needs Signoff |Patch doesn't apply --- Comment #29 from David Nind <[email protected]> --- The patch no longer applies 8-(.. Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 31503: Adjust db column patron_consent.type Applying: Bug 31503: Add $patron->consent Using index info to reconstruct a base tree... M Koha/Patron.pm M t/db_dependent/Koha/Patron.t Falling back to patching base and 3-way merge... Auto-merging t/db_dependent/Koha/Patron.t CONFLICT (content): Merge conflict in t/db_dependent/Koha/Patron.t Auto-merging Koha/Patron.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 31503: Add $patron->consent -- 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/
