http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5928
--- Comment #12 from claire.hernan...@biblibre.com <claire.hernan...@biblibre.com> 2011-04-08 07:53:24 UTC --- Thanks. Your "fix patch" replace "Patch" attachment? Message I see when I apply it: wr77152 (bug 5928): AllowPurchaseSuggestionBranchChoice sys pref -------------------------- Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y Applying: wr77152 (bug 5928): AllowPurchaseSuggestionBranchChoice sys pref Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging admin/systempreferences.pl Auto-merging installer/data/mysql/en/mandatory/sysprefs.sql CONFLICT (content): Merge conflict in installer/data/mysql/en/mandatory/sysprefs.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/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/modules/opac-suggestions.tmpl CONFLICT (content): Merge conflict in koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tmpl Failed to merge in the changes. Patch failed at 0001 wr77152 (bug 5928): AllowPurchaseSuggestionBranchChoice sys pref -- 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 Koha-bugs@lists.koha-community.org 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/
