https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=39014
David Nind <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #21 from David Nind <[email protected]> --- The patch no longer applies 8-(... Applying: Bug 39014: Add new method validate_guarantor Using index info to reconstruct a base tree... M Koha/Exceptions/Patron/Relationship.pm M Koha/Patron.pm M koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt M members/memberentry.pl M t/db_dependent/Koha/Patron.t Falling back to patching base and 3-way merge... Auto-merging t/db_dependent/Koha/Patron.t Auto-merging members/memberentry.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt Auto-merging Koha/Patron.pm CONFLICT (content): Merge conflict in Koha/Patron.pm Auto-merging Koha/Exceptions/Patron/Relationship.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 39014: Add new method validate_guarantor -- 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/
