http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9468
Frederic Durand <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] --- Comment #6 from Frederic Durand <[email protected]> --- I ve tested it on a sanbox, it did not work, here s the error message : Applying: Bug 9468 - Add ability to hide items from purchase suggestions forms Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging C4/Koha.pm Auto-merging installer/data/mysql/sysprefs.sql CONFLICT (content): Merge conflict in installer/data/mysql/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 Failed to merge in the changes. -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ 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/
