livemocha/sproutcore — comment on commit ecf9601dd8771f0c4eb00614270530fd2441acf6
File:  line 0
By tim-evans:

There's a git conflict in here. Please fix this.