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

--- Comment #18 from David Nind <da...@davidnind.com> ---
FYI, when applying the patch it showed whitespace errors/warnings:

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 31203: Alter cronlogaction to take a hash
Applying: Bug 31203: POC advance_notices
Applying: Bug 31203: Add End action to cronjobs and log viewer
Applying: Bug 31203: Alter other cronjobs that currenlty use cronlogaction
.git/rebase-apply/patch:257: trailing whitespace.
GetOptions( 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M       koha-tmpl/intranet-tmpl/prog/js/datatables.js
M       misc/cronjobs/automatic_renewals.pl
M       misc/cronjobs/batch_anonymise.pl
M       misc/cronjobs/fines.pl
M       misc/cronjobs/overdue_notices.pl
M       misc/cronjobs/patron_emailer.pl
M       misc/cronjobs/serialsUpdate.pl
M       misc/cronjobs/staticfines.pl
.git/rebase-apply/patch:257: trailing whitespace.
GetOptions( 
.git/rebase-apply/patch:214: new blank line at EOF.
+
.git/rebase-apply/patch:385: new blank line at EOF.
+
.git/rebase-apply/patch:401: new blank line at EOF.
+
.git/rebase-apply/patch:424: new blank line at EOF.
+
warning: squelched 13 whitespace errors
warning: 18 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging misc/cronjobs/staticfines.pl
Auto-merging misc/cronjobs/serialsUpdate.pl
Auto-merging misc/cronjobs/patron_emailer.pl
Auto-merging misc/cronjobs/overdue_notices.pl
Auto-merging misc/cronjobs/fines.pl
Auto-merging misc/cronjobs/batch_anonymise.pl
Auto-merging misc/cronjobs/automatic_renewals.pl
Auto-merging koha-tmpl/intranet-tmpl/prog/js/datatables.js

-- 
You are receiving this mail because:
You are watching all bug changes.
_______________________________________________
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
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