From 74165eb6acaca98d4da13409c4e5b5ecc9d260f7 Mon Sep 17 00:00:00 2001 From: Nicholas Seckar Date: Tue, 8 Aug 2006 21:21:04 +0000 Subject: New dependencies implementation git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4728 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activesupport/test/dependencies/conflict.rb | 1 + 1 file changed, 1 insertion(+) create mode 100644 activesupport/test/dependencies/conflict.rb (limited to 'activesupport/test/dependencies') 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 -- cgit v1.2.3