http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5079
Nicole C. Engard <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Patch Status|Needs Signoff |Does not apply --- Comment #8 from Nicole C. Engard <[email protected]> 2011-07-01 00:36:11 UTC --- Elliott, Is a default value of '2' right for this preference? Isn't '0' OFF? I tried to apply the new patch (is it a follow up) - and got this: nengard@debian:~/kohaclone$ git am -3 -i -u bug5079.patch Commit Body is: -------------------------- bug 5079 -------------------------- Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y Applying: bug 5079 Using index info to reconstruct a base tree... <stdin>:68: trailing whitespace. <stdin>:69: trailing whitespace. <stdin>:90: trailing whitespace. <span class="available"> <stdin>:101: trailing whitespace. <stdin>:115: trailing whitespace. warning: squelched 1 whitespace error warning: 6 lines add whitespace errors. Falling back to patching base and 3-way merge... Auto-merging installer/data/mysql/en/mandatory/sysprefs.sql CONFLICT (content): Merge conflict in installer/data/mysql/en/mandatory/sysprefs.sql Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref Auto-merging koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl CONFLICT (content): Merge conflict in koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl Failed to merge in the changes. Patch failed at 0001 bug 5079 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@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. _______________________________________________ Koha-bugs mailing list [email protected] http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
