aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test/dependencies
diff options
context:
space:
mode:
Diffstat (limited to 'activesupport/test/dependencies')
-rw-r--r--activesupport/test/dependencies/conflict.rb1
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