encorelab/EvoRoom2 — comment on commit 0ed608c01f79697794b83ba1a4518f453529c6d6
File:  line 0
By mackrauss:

Sadly enough it made the merge impossible for Colin. The file did not show up with git status since it is in the .gitignore file, however git realizes that the version from the repository is different to the version on Colin's machine. So I removed it and it was good. Looking at it now I probably should have made him to git stash the .projects file locally and do the merge.

Sorry for any inconvenience. Zuk you want to add the file again since I am not using Eclipse right now.