summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authortkimia <tkimia@purdue.edu>2014-04-26 16:57:26 -0400
committertkimia <tkimia@purdue.edu>2014-04-26 16:57:26 -0400
commit59d8a08232ae7872e2777ac42756fa259e1d1f6f (patch)
tree7a6f6819ca4d3226f33017c22de1e55a65e1fd6c /.gitignore
parentfedc51fb2d95d1e67c06e560448563a64fa458b1 (diff)
parent2aaaf29ae291edc34d0512ce9a812fc0de14f76b (diff)
Merge branch 'master' of https://github.com/LukeShu/leaguer
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore8
1 files changed, 7 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index c9926d1..0859f70 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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.