https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=13371
Koha Team Lyon 3 <k...@univ-lyon3.fr> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|Needs Signoff |Patch doesn't apply
--- Comment #56 from Koha Team Lyon 3 <k...@univ-lyon3.fr> ---
Tried on sandbox :
Some problems occurred applying patches from bug 13371:
<h1>Something went wrong !</h1>Applying: Bug 13371: Add filters on the supplier
list view 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/acqui/booksellers.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
Failed to merge in the changes.
Patch failed at 0001 Bug 13371: Add filters on the supplier list view
--
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/
