http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9043
jmbroust <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Failed QA CC| |jean-manuel.broust@univ-lyo | |n2.fr --- Comment #36 from jmbroust <[email protected]> --- <h1>Something went wrong !</h1>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 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 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-advsearch.tt Auto-merging opac/opac-search.pl Failed to merge in the changes. Patch failed at 0001 Bug 9043 - Changes to the advanced search page When you have resolved this problem run git bz apply --continue. If you would prefer to skip this patch, instead run git bz apply --skip. To restore the original branch and stop patching run git bz apply --abort. Bug 9043 - Adding system preferences to control the visibility of the content on the Advanced Search page 15329 - [Signed off] Bug 9043 - Changes to the advanced search page 21643 - [ALT 1/3] Bug 9043: Syspref improvement: add new type multiple 21644 - [ALT 2/3] Bug 9043: Changes to the advanced search page 21645 - [ALT 3/3] Bug 9043: Add the dropdown check list jquery plugin -- 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/
