http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9043
Campbell Reid-Tait <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] --- Comment #25 from Campbell Reid-Tait <[email protected]> --- [ALT 2/3] Bug 9043: Changes to the advanced search page (6.67 KB, patch) 2013-08-13 14:59 UTC, Jonathan Druart Failed to apply. Applying: Bug 9043: Changes to the advanced search page Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref Auto-merging installer/data/mysql/sysprefs.sql CONFLICT (content): Merge conflict in installer/data/mysql/sysprefs.sql 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/
