https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=27421
Marcel de Rooy <m.de.r...@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |BLOCKED --- Comment #40 from Marcel de Rooy <m.de.r...@rijksmuseum.nl> --- Manual patching the diffs: patching file Koha/BackgroundJob.pm patching file Koha/BackgroundJob/MARCImportCommitBatch.pm patching file Koha/BackgroundJob/MARCImportRevertBatch.pm patching file debian/templates/apache-shared-intranet-plack.conf patching file koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/marc_import_commit_batch.inc patching file koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/marc_import_revert_batch.inc patching file koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/stage_marc_for_import.inc patching file koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt patching file koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt patching file tools/manage-marc-import.pl Hunk #6 NOT MERGED at 275-283. I do not trust the last script. Somehow we ended up touching a considerable lower number of lines.. Will have a look -- 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/