http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10937
Koha Team Lyon 3 <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected] --- Comment #40 from Koha Team Lyon 3 <[email protected]> --- There's a problem when applying this patch on a sandbox : The sandbox you've requested is not ready. Some problems occurred applying patches from bug 10937: <h1>Something went wrong !</h1>Applying: Bug 10947 - Grouped ItemTypes - Patch should apply properly on latest master. 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/kohastructure.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/itemtypes.tt Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt CONFLICT (delete/modify): koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt deleted in HEAD and modified in Bug 10947 - Grouped ItemTypes - Patch should apply properly on latest master.. Version Bug 10947 - Grouped ItemTypes - Patch should apply properly on latest master. of koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt left in tree. Auto-merging opac/opac-search.pl Failed to merge in the changes. Patch failed at 0001 Bug 10947 - Grouped ItemTypes - Patch should apply properly on latest master. -- 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/
