[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

Nicole C. Engard <nengard at gmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |nengard at gmail.com
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #20 from Nicole C. Engard <nengard at gmail.com> ---
11:48 ~/kohaclone (master % u=)$ git qa 13590
>From git://git.koha-community.org/koha
 * branch            master     -> FETCH_HEAD
Branch bug13590-qa set up to track remote branch master from origin.
Switched to a new branch 'bug13590-qa'
Bug 13590 - Add ability to charge fines at start of charge period

41151 - Bug 13590 - Add ability to charge fines at start of charge period

Apply? [(y)es, (n)o, (i)nteractive] y
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
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
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
Failed to merge in the changes.
Patch failed at 0001 Bug 13590 - Add ability to charge fines at start of charge
period
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-13590---Add-ability-to-charge-fines-at-start-o-yKwpQy.patch
11:48 ~/kohaclone (bug13590-qa *+%|AM u=)$

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