http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10412
Koha Team Lyon 3 <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected] --- Comment #3 from Koha Team Lyon 3 <[email protected]> --- tested on a biblibre sandbox : Applying: Bug 10412 - The ability to update Acquisitions with credit notes, with the option to link to an existing invoice. Applying: Bug 10412 - Adding new table aqcreditnotes. 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. -- 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/
