.idea/ in .gitignore and still included under version control

[kamalx]

This is just to get the project in a better, hopefully cleaner state than it is. I see that the .idea/ directory is checked in to the repo and is also a part of the .gitignore file. My guess is that this is extraneous and generated by the IDE. The files cause merge conflicts every time updated code is checked out from the repo.

Can someone confirm if it is safe to get rid of this directory from git?

cc/ @anujkhare

[kamalx]

Found some related links that should help us make a good call on keeping the repo clean:

• https://www.gitignore.io/api/android
• http://stackoverflow.com/questions/16736856/
• http://stackoverflow.com/questions/25693964/