[Lazarus] SVN update conflicts

[Hans-Peter Diettrich]

Updating to rev. 36173 results in a number of conflicts in various 
Makefile, Makefile.compiled and Makefile.fpc, in components/ and 
packager/ subdirectories.

What's wrong?
How to fix that mess? (using TortoiseSVN)

DoDi


--
_______________________________________________
Lazarus mailing list
Lazarus@lists.lazarus.freepascal.org
http://lists.lazarus.freepascal.org/mailman/listinfo/lazarus