https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12159 Séverine Queune <severine.queune@bulac.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |severine.queune@bulac.fr Status|Needs Signoff |Patch doesn't apply --- Comment #7 from Séverine Queune <severine.queune@bulac.fr> --- I couldn't apply the patch on master branch (17.12.00.037) : Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 12159: Fix getting extended patron attributes for circ-menu Using index info to reconstruct a base tree... M Koha/Patron.pm M circ/circulation.pl M koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc M koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt M koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt M koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt M members/boraccount.pl M members/member-flags.pl M members/memberentry.pl M members/moremember.pl M members/paycollect.pl Falling back to patching base and 3-way merge... Auto-merging members/paycollect.pl Auto-merging members/moremember.pl Auto-merging members/memberentry.pl Auto-merging members/member-flags.pl Auto-merging members/boraccount.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc Auto-merging circ/circulation.pl Auto-merging Koha/Patron.pm CONFLICT (content): Merge conflict in Koha/Patron.pm Failed to merge in the changes. Patch failed at 0001 Bug 12159: Fix getting extended patron attributes for circ-menu The copy of the patch that failed is found in: /var/repositories/koha/.git/rebase-apply/patch -- You are receiving this mail because: You are watching all bug changes.