https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14715
Séverine Queune <severine.que...@bulac.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #91 from Séverine Queune <severine.que...@bulac.fr> --- The sandbox you've requested is not ready. Some problems occurred applying patches from bug 14715: <h1>Something went wrong !</h1>Applying: Bug 14715: results per page setting for catalog search Using index info to reconstruct a base tree... M C4/Search.pm M catalogue/search.pl M koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt M koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt M opac/opac-search.pl Falling back to patching base and 3-way merge... Auto-merging opac/opac-search.pl CONFLICT (content): Merge conflict in opac/opac-search.pl Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt CONFLICT (content): Merge conflict in koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt Auto-merging catalogue/search.pl CONFLICT (content): Merge conflict in catalogue/search.pl Auto-merging C4/Search.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 14715: results per page setting for catalog search -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list Koha-bugs@lists.koha-community.org https://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/