Merge pull request drnic#2 from SaitoWu/master

remove osx .DS_Store file, and add it to gitignore.
cclow · Apr 11, 2012 · 16fc39b · 16fc39b
2 parents 8ded626 + 6a6a09e
commit 16fc39b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -5,4 +5,4 @@ Gemfile.lock
 dist/*
 .idea
 .rvmrc
-
+.DS_Store
diff --git a/lib/rails/generators/.DS_Store b/lib/rails/generators/.DS_Store