http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11430
LuceBarbey <luce.bar...@cirad.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |luce.bar...@cirad.fr --- Comment #18 from LuceBarbey <luce.bar...@cirad.fr> --- The sandbox you've requested is not ready. Some problems occurred applying patches from bug 11430: <h1>Something went wrong !</h1>Applying: Bug 11430: DB changes: Add the primary key for search_history Applying: Bug 11430: delete search history by id - API changes Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging C4/Search/History.pm CONFLICT (content): Merge conflict in C4/Search/History.pm Failed to merge in the changes. Patch failed at 0001 Bug 11430: delete search history by id - API changes 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 11430 - Search history: Delete selected lines 25499 - Bug 11430: DB changes: Add the primary key for search_history 25500 - Bug 11430: delete search history by id - API changes 25501 - Bug 11430: UT: add unit tests to delete only selected lines 25502 - Bug 11430: OPAC changes 25503 - Bug 11430: OPAC changes -- prog theme 25504 - Bug 11430: Intranet changes 25618 - Bug 11430: Fix paths to the checkboxes jquery plugin -- 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/