https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28867 David Nind <david@davidnind.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |david@davidnind.com Status|Needs Signoff |Patch doesn't apply --- Comment #3 from David Nind <david@davidnind.com> --- Patch no longer applies 8-(... Applying: Bug 28867: Use Bootstrap button menu and modal for adding patrons to lists Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss M koha-tmpl/intranet-tmpl/prog/en/modules/members/member.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/members/member.tt Auto-merging koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss error: Failed to merge in the changes. Patch failed at 0001 Bug 28867: Use Bootstrap button menu and modal for adding patrons to lists -- You are receiving this mail because: You are watching all bug changes.