aboutsummaryrefslogtreecommitdiffstats
path: root/rails.gemspec
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2016-06-27 02:52:39 +0900
committerRyuta Kamizono <kamipo@gmail.com>2016-06-27 02:52:39 +0900
commite317e5e1e198147aa86dc04da5962c7277601967 (patch)
treeee4442ebfe74f4b9e7d39f0cc0c0d00050475a09 /rails.gemspec
parent5343626ea8b17a92b6b4603f2404ba06800b21b1 (diff)
downloadrails-e317e5e1e198147aa86dc04da5962c7277601967.tar.gz
rails-e317e5e1e198147aa86dc04da5962c7277601967.tar.bz2
rails-e317e5e1e198147aa86dc04da5962c7277601967.zip
Remove conflict line [ci skip]
Diffstat (limited to 'rails.gemspec')
0 files changed, 0 insertions, 0 deletions