https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=17168
--- Comment #47 from Marcel de Rooy <[email protected]> --- (In reply to Marcel de Rooy from comment #46) > Applying: Bug 17168: Remove j2a.pl script > Using index info to reconstruct a base tree... > M misc/cronjobs/j2a.pl > Falling back to patching base and 3-way merge... > CONFLICT (modify/delete): misc/cronjobs/j2a.pl deleted in Bug 17168: Remove > j2a.pl script and modified in HEAD. Version HEAD of misc/cronjobs/j2a.pl > left in tree. > error: Failed to merge in the changes. Forget that. The first patch should have been obsoleted. -- 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/
