aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2013-02-10 09:07:46 -0800
committerGuillermo Iguaran <guilleiguaran@gmail.com>2013-02-10 09:07:46 -0800
commit62f01bec76f7e47a5d1dd14b34f5105885de5378 (patch)
treef4bb6f5fd9ff36d257d7b006c15088fb8439ccc2
parentd29235d2a4df94b6db7d3e45ab15a6799363384e (diff)
parentbaeafb4914e044a7745c693fc4ba7501ca7c8b25 (diff)
downloadrails-62f01bec76f7e47a5d1dd14b34f5105885de5378.tar.gz
rails-62f01bec76f7e47a5d1dd14b34f5105885de5378.tar.bz2
rails-62f01bec76f7e47a5d1dd14b34f5105885de5378.zip
Merge pull request #9239 from senny/use_ruby_version_on_3_2
ignore .ruby-version instead of tool specifc config on 3-2-stable
-rw-r--r--.gitignore3
1 files changed, 1 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 52a431867c..24f9e9308d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,8 +4,7 @@
debug.log
.Gemfile
/.bundle
-/.rbenv-version
-/.rvmrc
+/.ruby-version
/Gemfile.lock
/pkg
/dist