merged gitignore file

Eyal Amir · Eyal Amir · commit 9b6c077345df · 2016-08-23T17:18:12.000+03:00
diff --git a/.gitignore b/.gitignore
@@ -34,7 +34,7 @@ captures/
 
 # Intellij
 *.iml
-.idea/workspace.xml
+.idea
 
 # Keystore files
 *.jks
