aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/option_merger.rb
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2010-10-16 18:44:24 +0200
committerXavier Noria <fxn@hashref.com>2010-10-16 18:44:24 +0200
commit964033f35124bf9fc9bba0b4cd5c5cd176882902 (patch)
tree8497f517402c19eae1fea22943565cbf11496ef7 /activesupport/lib/active_support/option_merger.rb
parent410ef3818ff96d2fa69e305b0b741f1ddd192e61 (diff)
downloadrails-964033f35124bf9fc9bba0b4cd5c5cd176882902.tar.gz
rails-964033f35124bf9fc9bba0b4cd5c5cd176882902.tar.bz2
rails-964033f35124bf9fc9bba0b4cd5c5cd176882902.zip
Revert "added ignore rule for linux temp file ending with a tilda ~"
This reverts commit 410ef3818ff96d2fa69e305b0b741f1ddd192e61. Reason: docrails has a very strict docs-only policy.
Diffstat (limited to 'activesupport/lib/active_support/option_merger.rb')
0 files changed, 0 insertions, 0 deletions