Merge pull request tumblr#148 from tumblr/will-gitignore-more-stuff

Ignoring some extra files that emacs and eclipse has put in my collins repo
Shopify · Apr 29, 2014 · 69e5e75 · 69e5e75
2 parents 64e7c25 + 4d200a7
commit 69e5e75
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -24,4 +24,11 @@ Gemfile.lock
 .classpath
 .project
 .settings/*
+.externalToolBuilders/
 _includes/*
+
+/bin
+
+#emacs files
+*~
+\#*\#