index
:
rails.git
3-2-stable-for-hmno
master
Mirror of official rails repo with custom fixes.
Harald Eilertsen
about
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
path:
root
/
activesupport
/
test
/
autoloading_fixtures
/
conflict.rb
blob: 6731ea51d82b8fb0f1031c3818ca325566516d2a (
plain
) (
blame
)
1
2
# frozen_string_literal: true
Conflict
=
2
