diff options
| author | Nicholas Seckar <nseckar@gmail.com> | 2006-08-08 21:21:04 +0000 |
|---|---|---|
| committer | Nicholas Seckar <nseckar@gmail.com> | 2006-08-08 21:21:04 +0000 |
| commit | 74165eb6acaca98d4da13409c4e5b5ecc9d260f7 (patch) | |
| tree | 024158d20563f34cca52a00b42aaa6c922777559 /activesupport/test/dependencies | |
| parent | 94a1309194fa5962e33d395ede14e94b237c54f5 (diff) | |
| download | rails-74165eb6acaca98d4da13409c4e5b5ecc9d260f7.tar.gz rails-74165eb6acaca98d4da13409c4e5b5ecc9d260f7.tar.bz2 rails-74165eb6acaca98d4da13409c4e5b5ecc9d260f7.zip | |
New dependencies implementation
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4728 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport/test/dependencies')
| -rw-r--r-- | activesupport/test/dependencies/conflict.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/activesupport/test/dependencies/conflict.rb b/activesupport/test/dependencies/conflict.rb new file mode 100644 index 0000000000..e888b7b54c --- /dev/null +++ b/activesupport/test/dependencies/conflict.rb @@ -0,0 +1 @@ +Conflict = 1
\ No newline at end of file |