Re: [Rails-devel] Added prototype configuration UI

[Erik V. <eri...@xs...>]

 
-----Original Message-----
From: Stefan Frey [mailto:ste...@we...] 
Sent: Sunday 18 July 2010 19:35
To: Development list for Rails: an 18xx game
Subject: Re: [Rails-devel] Added prototype configuration UI

Unfortunately the 
merge mechanism was totally confused by some other changes (import 
statements, white space) from your side, 

[EV]. Yes, I have noticed that the commit messages I'm getting from SVN
abound of unnecessary formatting and import-collapsing differences.
Not sure what the cause is. I did change my Eclipse version recently,
together with the change to SVN, but I have transferred the formatting
rules. In any case, I always have collapsed imports when there are >=3
classes of the same package, and have used spaces in stead of tabs. Not sure
what went wrong.

Two remarks:
* Please replace the -Dlog4j= option with -Dlog4j.configuration= 
to set your user-defined log4j configuration file.
Does not make much sense to use one system property to write it to another 
already defined by log4j. 

[EV] Yes, that makes sense! Works fine.

Erik.