diff options
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 |