[Koha-bugs] [Bug 31503] Allow several consent types on the consents tab of OPAC account page

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

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

--- Comment #37 from Marcel de Rooy <m.de.rooy at rijksmuseum.nl> ---
(In reply to David Nind from comment #29)
> 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

Try again please David.
Note that this test now fails on master in subtest 19 - 
notify_library_of_registration() with and without this patch set. So can be
ignored, should be addressed somewhere else.

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