http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10912
Nick Clemens <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] --- Comment #4 from Nick Clemens <[email protected]> --- Could not apply patch on sandbox: The sandbox you've requested is not ready. Some problems occurred applying patches from bug 10912: <h1>Something went wrong !</h1>Applying: Bug 10912 - Streamline hold error messages in staff interface Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt Failed to merge in the changes. Patch failed at 0001 Bug 10912 - Streamline hold error messages in staff interface 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 10912 - Streamline hold error messages in staff interface 21215 - Bug 10912 - Streamline hold error messages in staff interface Apply? [(y)es, (n)o, (i)nteractive] Patch left in /tmp/Bug-10912---Streamline-hold-error-messages-in-staf-Psre_j.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/
