[Koha-bugs] [Bug 4460] Amazon's AssociateID tag not used in links so referred revenue lost

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

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=4460

Nicole C. Engard <nengard at gmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |nengard at gmail.com
       Patch Status|Needs Signoff               |Does not apply

--- Comment #3 from Nicole C. Engard <nengard at gmail.com> 2011-02-16 21:29:28 UTC ---
Does not apply:



Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y
Applying bug 4460 : - Amazon's AssociateID tag not used in links so referred
revenue lost
error: patch failed:
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:413
error: koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl: patch
does not apply
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merged C4/Auth.pm
Auto-merged C4/External/Amazon.pm
Auto-merged koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
Auto-merged koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
Auto-merged koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl
Auto-merged koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl
Failed to merge in the changes.
Patch failed at 0001.
When you have resolved this problem run "git-am -i -3 --resolved".
If you would prefer to skip this patch, instead run "git-am -i -3 --skip".
nengard at debian:~/kohaclone$

-- 
Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the QA contact for the bug.