aboutsummaryrefslogblamecommitdiffstats
path: root/activesupport/test/autoloading_fixtures/conflict.rb
blob: c5d3f6bdc0a733a52ce8ac9d4abf50f3309438d4 (plain) (tree) 
72950568dd

ac717d65a3

80e66cc4d9

1

2

3

                             
 
            
# frozen_string_literal: true

Conflict = 2
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 02:10:18 +0000