[Koha-bugs] [Bug 18823] Advanced editor - Rancor - add ability to edit records in import batches

[bugzilla-daemon at bugs.koha-community.org]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18823

Cori Lynn Arnold <carnold at dgiinc.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Failed QA

--- Comment #126 from Cori Lynn Arnold <carnold at dgiinc.com> ---
Failed to apply:

Applying: Bug 18823: Rancor - add support for editing/searching records
Using index info to reconstruct a base tree...
M       C4/Biblio.pm
M       cataloguing/editor.pl
M       koha-tmpl/intranet-tmpl/prog/css/cateditor.css
M       koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc
M       koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc
Auto-merging koha-tmpl/intranet-tmpl/prog/css/cateditor.css
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/css/cateditor.css
Auto-merging cataloguing/editor.pl
Auto-merging C4/Biblio.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 18823: Rancor - add support for editing/searching
records
The copy of the patch that failed is found in: .git/rebase-apply/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-18823-Rancor---add-support-for-editingsearchin-0J4EtP.patch

-- 
You are receiving this mail because:
You are watching all bug changes.