[Koha-bugs] [Bug 5250] Various enhancements to web based checkouts

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

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

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

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

--- Comment #4 from Nicole C. Engard <nengard at gmail.com> 2011-03-01 17:57:08 UTC ---
Patch 2/2 does not apply:



Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y
Applying: Enhancement: [3.4] [2/2] Web-based checkout enhancements
Using index info to reconstruct a base tree...
error: patch failed:
installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql:286
error:
installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql:
patch does not apply
Did you hand edit your patch?
It does not apply to blobs recorded in its index.
Cannot fall back to three-way merge.
Patch failed at 0001 Enhancement: [3.4] [2/2] Web-based checkout enhancements
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".
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.