https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=17168 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |m.de.rooy@rijksmuseum.nl --- Comment #46 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- 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. -- You are receiving this mail because: You are watching all bug changes.