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

Katrin Fischer <[email protected]> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Passed QA                   |Patch doesn't apply

--- Comment #18 from Katrin Fischer <[email protected]> ---
Please rebase:

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 14250: Patron with fines cannot be discharged anymore
Using index info to reconstruct a base tree...
M       koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt
M       koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-discharge.tt
M       t/db_dependent/Patron/Borrower_Discharge.t
Falling back to patching base and 3-way merge...
Auto-merging t/db_dependent/Patron/Borrower_Discharge.t
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-discharge.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt
Applying: Bug 14250: (QA follow-up) Deduplicate checks
Applying: Bug 14250: (QA follow-up) Tidy code
error: sha1 information is lacking or useless
(t/db_dependent/Patron/Borrower_Discharge.t).
error: could not build fake ancestor

-- 
You are receiving this mail because:
You are watching all bug changes.
_______________________________________________
Koha-bugs mailing list
[email protected]
https://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/

Reply via email to