aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/commands
diff options
context:
space:
mode:
authorwangjohn <wangjohn@mit.edu>2013-08-21 16:34:36 -0400
committerwangjohn <wangjohn@mit.edu>2013-08-21 16:34:36 -0400
commitae54e41824011692106fe7a27dc0991a6342096d (patch)
tree585d6ff5256b667efacc2cbf1383308b17847f34 /railties/lib/rails/commands
parent631a2d977016df28ccf15f894f78ccaf3dfef913 (diff)
downloadrails-ae54e41824011692106fe7a27dc0991a6342096d.tar.gz
rails-ae54e41824011692106fe7a27dc0991a6342096d.tar.bz2
rails-ae54e41824011692106fe7a27dc0991a6342096d.zip
Removing merge conflict remnants in the guides.
Diffstat (limited to 'railties/lib/rails/commands')
0 files changed, 0 insertions, 0 deletions