http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9811
--- Comment #65 from [email protected] --- Mail when the application sandbox The sandbox you've requested is not ready. Some problems occurred applying patches from bug 9811: <h1>Something went wrong !</h1>Applying: Bug 9811: Patron search improvement Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging C4/Members.pm Auto-merging koha-tmpl/intranet-tmpl/prog/en/js/datatables.js Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt Auto-merging members/member.pl CONFLICT (content): Merge conflict in members/member.pl Auto-merging members/moremember.pl Failed to merge in the changes. Patch failed at 0001 Bug 9811: Patron search improvement 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 9811 - Patrons search improvements 21169 - Bug 9811: Patron search improvement 21170 - Bug 9811: Add unit tests for C4::Utils::DT::Members 21171 - Bug 9811: QA followup 21172 - Bug 9811 - multilines notes brakes JSON 21173 - Bug 9811: use count(primary_key) instead of count(*) 21174 - Bug 9811: A limit clause should be always added. 21175 - Bug 9811: Load the page without any data. Apply? [(y)es, (n)o, (i)nteractive] Patch left in /tmp/Bug-9811-Patron-search-improvement-zsuviY.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/
