I just spent most of an hour resolving merge conflicts,
mostly due to our use of keywords. I think my time could
have been better spent on improving the build system.
Can we please avoid using keywords unless the information
needs to be compiled into ReactOS?
Casper
Show replies by date