http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=13049
--- Comment #8 from M. de Rooy <[email protected]> --- Thanks, Frederic for your SO. I am not sure however if everything went fine? When applying your patch, I get: fatal: sha1 information is lacking or useless (misc/cronjobs/cleanup_database.pl). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. And the signed-off patch contains this line: +>>>>>>> Bug 13049: Merge selfreg cron jobs into cleanup_database It is in the usage statement of cleanup_database.pl If it is easy for you to fix it, go ahead :) Otherwise I will fix it tomorrow or so.. -- 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/
