[Koha-bugs] [Bug 17168] Add a command line script for updating patron category based on status

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

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

Katrin Fischer <katrin.fischer at bsz-bw.de> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Signed Off                  |Patch doesn't apply
                 CC|                            |katrin.fischer at bsz-bw.de

--- Comment #14 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
Patch doesn't apply, please rebase!

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 17168 - Add a command line script for updating patron category
based on status
Using index info to reconstruct a base tree...
M       Koha/Patrons.pm
Falling back to patching base and 3-way merge...
Auto-merging Koha/Patrons.pm
CONFLICT (content): Merge conflict in Koha/Patrons.pm
Failed to merge in the changes.
Patch failed at 0001 Bug 17168 - Add a command line script for updating patron
category based on status
The copy of the patch that failed is found in:
   /home/vagrant/kohaclone/.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-17168---Add-a-command-line-script-for-updating-hwoO66.patch

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