http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5339
Koha Team Lyon 3 <k...@univ-lyon3.fr> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|Needs Signoff |Patch doesn't apply
CC| |k...@univ-lyon3.fr
--- Comment #26 from Koha Team Lyon 3 <k...@univ-lyon3.fr> ---
Something went wrong !
Applying: Bug 5339: Invoices management improvement
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging installer/data/mysql/kohastructure.sql
Auto-merging installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Failed to merge in the changes.
Patch failed at 0001 Bug 5339: Invoices management improvement
--
You are receiving this mail because:
You are the QA Contact for the bug.
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/
