[Koha-bugs] [Bug 14242] Use ISBN-field to fill out purchase suggestions (using an Ajax-request)

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

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

Maryse Simard <maryse.simard at inlibro.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |maryse.simard at inlibro.com

--- Comment #46 from Maryse Simard <maryse.simard at inlibro.com> ---
Patch doesn't apply

Applying: Bug 14242: Use ISBN-field to automaticly fill out purchase
suggestions
Using index info to reconstruct a base tree...
M       installer/data/mysql/sysprefs.sql
M       koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
M       koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
M       koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt
CONFLICT (content): Merge conflict in
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
Auto-merging installer/data/mysql/sysprefs.sql
error: Failed to merge in the changes.
Patch failed at 0001 Bug 14242: Use ISBN-field to automaticly fill out purchase
suggestions

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