https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16111
Cab Vinton <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] --- Comment #28 from Cab Vinton <[email protected]> --- Patch failed to apply to Biblibre Sandbox 1 -- Some problems occurred applying patches from bug 16111: <h1>Something went wrong !</h1>Applying: Bug 16111: Fix content type for RSS feed Applying: Bug 16111: Fix atom support Using index info to reconstruct a base tree... M koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt CONFLICT (content): Merge conflict in koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt error: Failed to merge in the changes. Patch failed at 0001 Bug 16111: Fix atom support The copy of the patch that failed is found in: .git/rebase-apply/patch 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 16111 - RSS feed for OPAC search results has wrong content type 77057 - Bug 16111: Fix content type for RSS feed 77058 - Bug 16111: Fix atom support 77059 - Bug 16111: Remove 'rss2' which should be 'rss' or 'atom' 77060 - Bug 16111: (follow-up) Fixes for simplicity and validation Apply? [(y)es, (n)o, (i)nteractive] Patch left in /tmp/Bug-16111-Fix-atom-support-69Epde.patch . -- 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/
