https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=33947
David Nind <da...@davidnind.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |da...@davidnind.com Status|Needs Signoff |Patch doesn't apply --- Comment #4 from David Nind <da...@davidnind.com> --- Patch no longer applies 8-(.. Bug 33947 - Move GetAllIssues to Koha 152195 - Bug 33947: Remove GetAllIssues Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 33947: Remove GetAllIssues Using index info to reconstruct a base tree... M C4/Members.pm M t/db_dependent/Members/GetAllIssues.t Falling back to patching base and 3-way merge... CONFLICT (modify/delete): t/db_dependent/Members/GetAllIssues.t deleted in Bug 33947: Remove GetAllIssues and modified in HEAD. Version HEAD of t/db_dependent/Members/GetAllIssues.t left in tree. Auto-merging C4/Members.pm CONFLICT (content): Merge conflict in C4/Members.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 33947: Remove GetAllIssues -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list Koha-bugs@lists.koha-community.org 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/