[Koha-bugs] [Bug 7736] Edifact QUOTE and ORDER functionality

[bugzilla-daemon at bugs.koha-community.org]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7736

--- Comment #15 from Jared Camins-Esakov <jcamins at cpbibliography.com> ---
(In reply to comment #14)
> Errors on apply the patch:
> error: patch failed: installer/data/mysql/sysprefs.sql:382
> error: installer/data/mysql/sysprefs.sql: patch does not apply
> error: patch failed: installer/data/mysql/updatedatabase.pl:5966
> error: installer/data/mysql/updatedatabase.pl: patch does not apply
> 
> In fact the problem is trivial: those files (sysprefs.sql and
> updatedatabase.pl)
> are changing quite quickly those days

If you use git am -3 you'll be able to resolve the conflict yourself.

-- 
You are receiving this mail because:
You are watching all bug changes.