https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23706
Séverine Queune <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected] --- Comment #9 from Séverine Queune <[email protected]> --- The sandbox you've requested is not ready. Some problems occurred applying patches from bug 23706: <h1>Something went wrong !</h1>Applying: LLP: Bug 23706 Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.csv.inc Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.csv.inc CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.csv.inc error: Failed to merge in the changes. Patch failed at 0001 LLP: Bug 23706 -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] 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/
