http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10612
Kyle M Hall <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Needs Signoff --- Comment #4 from Kyle M Hall <[email protected]> --- (In reply to Liz Rea from comment #3) > Hi, > > Tried to test this, got the following: > > 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 It applied fine for me. Did you apply all the dependencies? First you need to apply 8798, then 10565, then finally this 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/
