https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15565
Cab Vinton <bibli...@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |bibli...@gmail.com --- Comment #92 from Cab Vinton <bibli...@gmail.com> --- Patch failed on PTFS sanbdbox 0: Some problems occurred applying patches from bug 15565: <h1>Something went wrong !</h1>Applying: Bug 15565: Place multiple holds at once for the same record on staff and OPAC. Applying: Bug 15565: CSS changes error: Failed to merge in the changes. Using index info to reconstruct a base tree... M koha-tmpl/opac-tmpl/bootstrap/css/opac.css M koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss Auto-merging koha-tmpl/opac-tmpl/bootstrap/css/opac.css CONFLICT (content): Merge conflict in koha-tmpl/opac-tmpl/bootstrap/css/opac.css Patch failed at 0001 Bug 15565: CSS changes 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 15565 - Place multiple holds at once for the same record 78242 - Bug 15565: Place multiple holds at once for the same record on staff and OPAC. 78243 - Bug 15565: CSS changes 78244 - Bug 15565: Use item's biblionumber only on item-level request 78245 - Bug 15565: Set 'found' parameter correctly when ReservesNeedReturns is off 78246 - Bug 15565: Alert librarian that maximum holds per record is reached 78247 - Bug 15565: Remove use of GetBiblionumberFromItemnumber 78248 - Bug 15565: Fixed issues preventing any item-level holds being placed in OPAC 78266 - Bug 15565: Changed the retrieval of selected hold pickup branch in opac-reserve.pl 78305 - Bug 15565: Allow up to (and including) maxreserves number of OPAC item levelholds Apply? [(y)es, (n)o, (i)nteractive] Patch left in /tmp/Bug-15565-CSS-changes-i7sD5P.patch . -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list Koha-bugs@lists.koha-community.org 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/