[ros-dev] waste of time

[Casper Hornstrup]

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

-------------- next part --------------
A non-text attachment was scrubbed...
Name: conflicts.zip
Type: application/octet-stream
Size: 10156 bytes
Desc: not available
Url : http://reactos.com:8080/pipermail/ros-dev/attachments/20050514/22d4972e/conflicts-0001.obj