http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=4262 --- Comment #2 from Nicole C. Engard <nengard@gmail.com> 2010-12-14 16:17:24 UTC --- I'm confused - it says it didn't apply then it says it's already applied: Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y Applying Fix for Bug 4262, changing matching rule add big message box .dotest/patch:119: trailing whitespace. <li> .dotest/patch:121: trailing whitespace. <option value="">Do not look for matching records</option> .dotest/patch:141: trailing whitespace. .dotest/patch:144: trailing whitespace. error: patch failed: koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tmpl:7 error: koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tmpl: patch does not apply Using index info to reconstruct a base tree... <stdin>:119: trailing whitespace. <li> <stdin>:121: trailing whitespace. <option value="">Do not look for matching records</option> <stdin>:141: trailing whitespace. <stdin>:144: trailing whitespace. warning: 4 lines add whitespace errors. Falling back to patching base and 3-way merge... No changes -- Patch already applied. nengard@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.