[Koha-bugs] [Bug 13590] Add ability to charge fines at start of charge period

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

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=13590

Mirko Tietgen <mirko at abunchofthings.net> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |mirko at abunchofthings.net
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #9 from Mirko Tietgen <mirko at abunchofthings.net> ---
Patch needs a rebase.

Apply? [(y)es, (n)o, (i)nteractive] i
Applying: Bug 13590 - Add ability to charge fines at start of charge period
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging t/db_dependent/Circulation_Issuingrule.t
CONFLICT (content): Merge conflict in t/db_dependent/Circulation_Issuingrule.t
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
Auto-merging installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Auto-merging installer/data/mysql/kohastructure.sql
Auto-merging admin/smart-rules.pl
CONFLICT (content): Merge conflict in admin/smart-rules.pl
Auto-merging Koha/Schema/Result/Issuingrule.pm
CONFLICT (content): Merge conflict in Koha/Schema/Result/Issuingrule.pm
Auto-merging C4/Overdues.pm
CONFLICT (content): Merge conflict in C4/Overdues.pm
Failed to merge in the changes.

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