http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7420
Kyle M Hall <kyle.m.h...@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #22 from Kyle M Hall <kyle.m.h...@gmail.com> --- 12:26 ~/kohaclone (bug7420-qa $% u=)$ git am -3iu /tmp/patch-Gs1Vwl.patch Commit Body is: -------------------------- bug_7420: Added overduefinescap to issuingrules Replaced existing MaxFine syspref logic with overduefinescap. Repurposed MaxFine to be the overall overdue limit for all items overdue. Implemented new MaxFine logic in UpdateFine(). -------------------------- Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y Applying: bug_7420: Added overduefinescap to issuingrules /home/koha/kohaclone/.git/rebase-apply/patch:21: trailing whitespace. C<$unitcount> is the number of chargeable units (days between start and end dates, Calendar adjusted where needed, warning: 1 line adds whitespace errors. Using index info to reconstruct a base tree... <stdin>:21: trailing whitespace. C<$unitcount> is the number of chargeable units (days between start and end dates, Calendar adjusted where needed, warning: 1 line applied after fixing whitespace errors. Falling back to patching base and 3-way merge... Auto-merging C4/Overdues.pm CONFLICT (content): Merge conflict in C4/Overdues.pm Auto-merging admin/smart-rules.pl Auto-merging installer/data/mysql/kohastructure.sql Auto-merging installer/data/mysql/sysprefs.sql Auto-merging installer/data/mysql/updatedatabase.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt Failed to merge in the changes. Patch failed at 0001 bug_7420: Added overduefinescap to issuingrule -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list Koha-bugs@lists.koha-community.org http://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/