Merge pull request koajs#42 from santacruz123/master

.idea - gitignore
caijohnny · Oct 5, 2014 · f9ff501 · f9ff501
2 parents 4caecb9 + 828b00f
commit f9ff501
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -32,6 +32,7 @@
 ehthumbs.db
 Icon?
 Thumbs.db
+.idea
 
 # Node.js #
 ###########
@@ -68,4 +69,4 @@ npm-debug.log
 test/*.2
 test/*/*.2
 test/*.mp4
-test/images/originalSideways.jpg.2
+test/images/originalSideways.jpg.2