[Koha-bugs] [Bug 16223] Automatically remove any borrower debarments after a payment

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

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

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

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

--- Comment #33 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
Hi Emmi, patches no longer apply, could you please rebase?

The script notes some trailing whitespace also, maybe worth checking. 

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 16223: Automatically remove any borrower debarments after a
payment
.git/rebase-apply/patch:28: trailing whitespace.

.git/rebase-apply/patch:160: trailing whitespace.
     - 
warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
M       Koha/Account.pm
M       Koha/Patron/Debarments.pm
M       installer/data/mysql/mandatory/sysprefs.sql
M       koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
M       t/db_dependent/Patron/Borrower_Debarments.t
.git/rebase-apply/patch:28: trailing whitespace.

.git/rebase-apply/patch:160: trailing whitespace.
     - 
warning: 2 lines applied after fixing whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging t/db_dependent/Patron/Borrower_Debarments.t
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
Auto-merging installer/data/mysql/mandatory/sysprefs.sql
Auto-merging Koha/Patron/Debarments.pm
CONFLICT (content): Merge conflict in Koha/Patron/Debarments.pm
Auto-merging Koha/Account.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 16223: Automatically remove any borrower debarments
after a payment
hint: Use 'git am --show-current-patch=diff' to see the failed 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-16223-Automatically-remove-any-borrower-debarm-iuWbtz.p

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