diff options
| author | Xavier Noria <fxn@hashref.com> | 2016-08-06 19:55:02 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2016-08-06 20:16:27 +0200 |
| commit | 80e66cc4d90bf8c15d1a5f6e3152e90147f00772 (patch) | |
| tree | e7e75464af04f3cf1935b29238dbd7cb2337b0dd /activesupport/test/dependencies/conflict.rb | |
| parent | 411ccbdab2608c62aabdb320d52cb02d446bb39c (diff) | |
| download | rails-80e66cc4d90bf8c15d1a5f6e3152e90147f00772.tar.gz rails-80e66cc4d90bf8c15d1a5f6e3152e90147f00772.tar.bz2 rails-80e66cc4d90bf8c15d1a5f6e3152e90147f00772.zip | |
normalizes indentation and whitespace across the project
Diffstat (limited to 'activesupport/test/dependencies/conflict.rb')
| -rw-r--r-- | activesupport/test/dependencies/conflict.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/test/dependencies/conflict.rb b/activesupport/test/dependencies/conflict.rb index e888b7b54c..7eff49bbfa 100644 --- a/activesupport/test/dependencies/conflict.rb +++ b/activesupport/test/dependencies/conflict.rb @@ -1 +1 @@ -Conflict = 1
\ No newline at end of file +Conflict = 1 |