FRC2115/2012Robot — comment on commit 1975743b19935f0c199540a8afa03e584640978a
File:  line 0
By Slix:

Right. The reason for that is that you committed an .orig file, which I guess is used in KDiff or something?

I'll fix it by reverting to my last commit. We made the same changes by deleting those three classes anyway.