https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28840
Samu Heiskanen <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected] --- Comment #4 from Samu Heiskanen <[email protected]> --- Applying: Bug 28840: Better texts in batch record modification/deletion Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt M koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt error: Failed to merge in the changes. Patch failed at 0001 Bug 28840: Better texts in batch record modification/deletion hint: Use 'git am --show-current-patch' to see the failed patch When you have resolved this problem run "git bz apply --continue". If you would prefer to skip this patch, instead run "git bz apply --skip". To restore the original branch and stop patching run "git bz apply --abort". Patch left in /tmp/Bug-28840-Better-texts-in-batch-record-modificatio-wjnSzH.patch Patch doesn't apply. But very easy to fix. -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] 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/
