http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10612
Katrin Fischer <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply CC| |[email protected] --- Comment #12 from Katrin Fischer <[email protected]> --- Hi Kyle, I am sorry, but this patch no longer applies and I was not sure how to resolve the conflict, could you please take a look? [~/kohaclone (73-10612-deletepatronsbatch)]> git bz apply 10612 Bug 10612 - Add ability to delete patrons with batch patron modification tool 21081 - Bug 10612 - Add ability to delete patrons with batch patron modification tool 21446 - Bug 10612 - Add ability to delete patrons with batch patron modification tool - QA Followup - Move member deletion related calls to DelMember Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 10612 - Add ability to delete patrons with batch patron modification tool /home/katrin/kohaclone/.git/rebase-apply/patch:41: trailing whitespace. Cannot delete patron /home/katrin/kohaclone/.git/rebase-apply/patch:49: trailing whitespace. Cannot delete patron /home/katrin/kohaclone/.git/rebase-apply/patch:101: trailing whitespace. warning: 3 lines add whitespace errors. Using index info to reconstruct a base tree... <stdin>:41: trailing whitespace. Cannot delete patron <stdin>:49: trailing whitespace. Cannot delete patron <stdin>:101: trailing whitespace. warning: 3 lines applied after fixing whitespace errors. Falling back to patching base and 3-way merge... Auto-merging tools/modborrowers.pl CONFLICT (content): Merge conflict in tools/modborrowers.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt Failed to merge in the changes. Patch failed at 0001 Bug 10612 - Add ability to delete patrons with batch patron modification tool When you have resolved this problem run "git bz apply --continue". If you would prefer to skip this patch, instead run "git bz apply --skip". To restore the original branch and stop patching run "git bz apply --abort". Patch left in /tmp/Bug-10612---Add-ability-to-delete-patrons-with-bat-_BRqbC.patch -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] http://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/
