[Koha-bugs] [Bug 23291] Allow selecting patrons by smsalertnumber in batch patron modification

[bugzilla-daemon at bugs.koha-community.org]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23291

Lisette Scheer <lisetteslatah at gmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |lisetteslatah at gmail.com

--- Comment #17 from Lisette Scheer <lisetteslatah at gmail.com> ---
Bug 23291 - Allow selecting patrons by smsalertnumber in batch patron
modification

101931 - Bug 23291: Find patrons by smsalertnumber in the batch patron
modification
101932 - Bug 23291: Retrieve all patrons with given SMS number, and change
inputs
101933 - Bug 23291: (follow-up) Fix capitalization on SMS

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 23291: Find patrons by smsalertnumber in the batch patron
modification
Using index info to reconstruct a base tree...
M       tools/modborrowers.pl
Falling back to patching base and 3-way merge...
Auto-merging tools/modborrowers.pl
CONFLICT (content): Merge conflict in tools/modborrowers.pl
error: Failed to merge in the changes.
Patch failed at 0001 Bug 23291: Find patrons by smsalertnumber in the batch
patron modification
The copy of the patch that failed is found in: .git/rebase-apply/patch
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-23291-Find-patrons-by-smsalertnumber-in-the-ba-HjqO44.patch

-- 
You are receiving this mail because:
You are watching all bug changes.