[Koha-bugs] [Bug 11299] Add a button to automatically link authority records in cataloguing (AJAX)

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

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

Katrin Fischer <katrin.fischer at bsz-bw.de> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Signed Off                  |Patch doesn't apply

--- Comment #110 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
I just realized I gave this the first sign-off - so I am out for QA. 

But also, patch doesn't apply:

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 11299: Add a button to the biblio edition page to automatically
add authority links in the current biblio record via AJAX. Also adds a button
to easily create missing authority records.
Using index info to reconstruct a base tree...
M       C4/Biblio.pm
M       koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
M       koha-tmpl/intranet-tmpl/prog/js/cataloging.js
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/js/cataloging.js
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 C4/Biblio.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 11299: Add a button to the biblio edition page to
automatically add authority links in the current biblio record via AJAX. Also
adds a button to easily create missing authority 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-11299-Add-a-button-to-the-biblio-edition-page--LuP6BI.patch

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