--- Dmitry Timoshkov <[EMAIL PROTECTED]> a écrit : > "Sylvain Petreolle" <[EMAIL PROTECTED]> wrote: > > > Notepad now uses NLS. > > > > Please remove notepad.rc, that defined > > old macro system for language resources. > > Please resend with resolved CVS conflicts. Search > for > <<<<<<< and >>>>>>> in your patch. > > -- > Dmitry.
Ok, all conflicts are due to the insertion of the LGPL text in the files. What should I do to resolve the conflicts ? ___________________________________________________________ Do You Yahoo!? -- Une adresse @yahoo.fr gratuite et en français ! Yahoo! Mail : http://fr.mail.yahoo.com
