diff options
author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-26 20:09:23 -0400 |
---|---|---|
committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-26 20:09:23 -0400 |
commit | ac499ddadbae8823b4eee58187bc0f1ef9a0dc45 (patch) | |
tree | 0e0d0270e0bde9a59f4682a7ddff36560f0eed2d /.gitignore | |
parent | 67d95e5b92e3d19765c7ccaf5460737ffe2173f4 (diff) |
pull changes from master
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 9 |
1 files changed, 8 insertions, 1 deletions
@@ -15,7 +15,13 @@ /log/*.log /tmp -# The above is from Rails. The following is from Luke. +# The above is from Rails. + +# The next lines are from `rails generate figaro:install` +# Ignore application configuration +/config/application.yml + +# The rest is from Luke. /vendor/bundle nohup.out # As noted above, you probably want to add the following to your global git config. @@ -24,3 +30,4 @@ nohup.out *# .#* .nfs* +.*.swp |