http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10477 I'm just a bot <gitbot@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |gitbot@bugs.koha-community. | |org --- Comment #3 from I'm just a bot <gitbot@bugs.koha-community.org> --- Applying: Bug-10477 Increased flexibility for upload of Staged Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt M tools/manage-marc-import.pl Falling back to patching base and 3-way merge... Auto-merging tools/manage-marc-import.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt Patch failed at 0001 Bug-10477 Increased flexibility for upload of Staged The copy of the patch that failed is found in: /home/christopher/git/koha/.git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". -- You are receiving this mail because: You are watching all bug changes.