http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10860
mathieu saby <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected] | |r --- Comment #15 from mathieu saby <[email protected]> --- Hi. I wanted to test, but I've got the following message. Maybe my VM is not clean, or it is something to fix in the patch? <stdin>:1276: new blank line at EOF. + warning: 1 line adds whitespace errors. Falling back to patching base and 3-way merge... error: The following untracked working tree files would be overwritten by merge: misc/cronjobs/bulk_transferts.pl Please move or remove them before you can merge. Aborting If it needs rebase, could you replace "13.00" by "15.00" in updatedatabase ? Mathieu -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] 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/
