http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15400 Magnus Enger <magnus@libriotech.no> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |magnus@libriotech.no Status|Needs Signoff |Patch doesn't apply --- Comment #5 from Magnus Enger <magnus@libriotech.no> --- $ git bz apply 15400 Bug 15400 - display patron age in useful places 45882 - Bug 15400: Show patron age in search results Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 15400: Show patron age in search results Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc M koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt M koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc Failed to merge in the changes. Patch failed at 0001 Bug 15400: Show patron age in search results -- You are receiving this mail because: You are watching all bug changes.