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

[pettanr/pettanr.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 574645e..97f7214 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -11,16 +11,18 @@ config/aws.yaml
 config/picture_io.yml
 config/license.yml
 config/speech_balloon.yml
+config/writing_format.yml
 config/element.yml
 config/profile.json
 config/test_layout
 lib/test/temp/
-db/migrate/*_creative_commons_v??_licenses_attributes.rb
-db/migrate/*_pettan_commons_v??_licenses_attributes.rb
-db/migrate/*_pettan_protected_v??_licenses_attributes.rb
-db/migrate/*_pettan_public_v??_licenses_attributes.rb
-db/migrate/*_public_domain_v??_licenses_attributes.rb
-db/migrate/*_unknown_v??_licenses_attributes.rb
+db/migrate/*_creative_commons_v??_licenses*.rb
+db/migrate/*_pettan_commons_v??_licenses*.rb
+db/migrate/*_pettan_protected_v??_licenses*.rb
+db/migrate/*_pettan_public_v??_licenses*.rb
+db/migrate/*_public_domain_v??_licenses*.rb
+db/migrate/*_unknown_v??_licenses*.rb
 db/migrate/*_speech_balloon_speech_balloons.rb
 db/migrate/*_speech_balloon_balloons.rb
 db/migrate/*_speech_balloon_speeches.rb
+db/migrate/*_speech_balloon_import*.rb