http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5922 Nicole C. Engard <nengard@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |nengard@gmail.com Patch Status|Needs Signoff |Does not apply --- Comment #3 from Nicole C. Engard <nengard@gmail.com> 2011-03-28 00:31:56 UTC --- Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y Applying: Bug 5922: Notify of waiting holds at checkin Using index info to reconstruct a base tree... <stdin>:25: trailing whitespace. <stdin>:26: trailing whitespace. if ( C4::Context->preference("WaitingNotifyAtCheckin") ) { <stdin>:29: trailing whitespace. my $waiting_holds; <stdin>:34: trailing whitespace. } <stdin>:36: trailing whitespace. $template->param( warning: squelched 2 whitespace errors warning: 7 lines add whitespace errors. Falling back to patching base and 3-way merge... Auto-merging circ/returns.pl Auto-merging installer/data/mysql/de-DE/mandatory/sysprefs.sql Auto-merging installer/data/mysql/en/mandatory/sysprefs.sql Auto-merging installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql Auto-merging installer/data/mysql/it-IT/necessari/sysprefs.sql Auto-merging installer/data/mysql/pl-PL/mandatory/sysprefs.sql Auto-merging installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql Auto-merging installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql Auto-merging installer/data/mysql/updatedatabase.pl CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl 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 Auto-merging kohaversion.pl CONFLICT (content): Merge conflict in kohaversion.pl Failed to merge in the changes. Patch failed at 0001 Bug 5922: Notify of waiting holds at checkin 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.