[Koha-bugs] [Bug 5417] System Preference page for itemBarcodeInputFilter text is "scanned patron barcodes."

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

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

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

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

--- Comment #5 from Nicole C. Engard <nengard at gmail.com> 2011-03-01 21:33:07 UTC ---
It does not apply:


Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y
Applying: Bug 5417: itemBarcodeInputFilter text change
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
Failed to merge in the changes.
Patch failed at 0001 Bug 5417: itemBarcodeInputFilter text change
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.