http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5215 Nicole C. Engard <nengard@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |nengard@gmail.com Patch Status|Needs Signoff |Does not apply --- Comment #2 from Nicole C. Engard <nengard@gmail.com> 2010-12-16 15:43:14 UTC --- Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y Applying Bug 5215 - Barcode field not cleared when using "Add and Duplicate" option on additem.pl error: patch failed: cataloguing/additem.pl:69 error: cataloguing/additem.pl: patch does not apply Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merged cataloguing/additem.pl CONFLICT (content): Merge conflict in cataloguing/additem.pl 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 th -- 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.