[Koha-bugs] [Bug 16117] Log borrower cardnumbers and item barcodes which are not valid

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

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

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

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Signed Off                  |Patch doesn't apply

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

73178 - Bug 16117: Give methods better names

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 16117: Log borrower cardnumbers and item barcodes which are not
valid
Using index info to reconstruct a base tree...
M       C4/Circulation.pm
M       circ/circulation.pl
M       installer/data/mysql/sysprefs.sql
M      
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
M       t/db_dependent/Stats.t
Falling back to patching base and 3-way merge...
Auto-merging t/db_dependent/Stats.t
CONFLICT (content): Merge conflict in t/db_dependent/Stats.t
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
Auto-merging installer/data/mysql/sysprefs.sql
Auto-merging circ/circulation.pl
Auto-merging C4/Circulation.pm
CONFLICT (content): Merge conflict in C4/Circulation.pm
Failed to merge in the changes.
Patch failed at 0001 Bug 16117: Log borrower cardnumbers and item barcodes
which are not valid
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-16117-Log-borrower-cardnumbers-and-item-barcod-t7ci5h.patch

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