Commit 85d17967 authored by Chris Wanstrath's avatar Chris Wanstrath

Merge pull request #225 from frankel/master

config/*.yml should not be ignored in Rails
parents 4c9fba7b 171709e8
...@@ -12,6 +12,5 @@ capybara-*.html ...@@ -12,6 +12,5 @@ capybara-*.html
/coverage/ /coverage/
/spec/tmp/* /spec/tmp/*
**.orig **.orig
config/*.yml
rerun.txt rerun.txt
pickle-email-*.html pickle-email-*.html
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment