aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test/dependencies/conflict.rb
blob: e888b7b54cf9dd941e9c7fde47c5e2cecf080887 (plain) (blame)
1
Conflict = 1