aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test/dependencies/conflict.rb
diff options
context:
space:
mode:
Diffstat (limited to 'activesupport/test/dependencies/conflict.rb')
-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
index a7199a093b..aa22ec0b09 100644
--- a/activesupport/test/dependencies/conflict.rb
+++ b/activesupport/test/dependencies/conflict.rb
@@ -1,2 +1,3 @@
# frozen_string_literal: true
+
Conflict = 1