http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7882 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 #27 from I'm just a bot <gitbot@bugs.koha-community.org> --- Applying: Bug 7882 - move or reorder 6xx and 7xx fields Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/css/addbiblio.css M koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/css/addbiblio.css Patch failed at 0001 Bug 7882 - move or reorder 6xx and 7xx fields 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.