Merge branch 'master' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06heroku

[pettanr/pettanr.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 1cf8695..7e0fe35 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,8 +3,6 @@ db/*.sqlite3
 db/schema.rb
 log/*.log
 tmp/
+Gemfile.lock
 .sass-cache/
-public/image/*
-config/aws.yaml
-config/test_layout
 lib/test/temp/