Re: Rewrite of Notepad using NLS(cvs tree cleanup)

[Dmitry Timoshkov]

"Sylvain Petreolle" <spetreolle(a)yahoo.fr> wrote:
> Ok, all conflicts are due to the insertion of the LGPL
> text in the files.
> What should I do to resolve the conflicts ?

Apparently manually edit your (patched) sources and produce
new correct diff file.

-- 
Dmitry.