diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-05 22:02:15 -0400 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-05 22:02:15 -0400 |
| commit | 000cd5558ac21c11060da721d76a27f0531fcfa8 (patch) | |
| tree | f4dce5ad243d0d8d913a233c267e900b224d675b /db/schema.rb | |
| parent | f25e9db11971e073d386f4d977f277939678f025 (diff) | |
| parent | 5b4e3bd04d9a448643dd56ff55e77c1488bf5100 (diff) | |
Merge branch 'clean2'
Diffstat (limited to 'db/schema.rb')
| -rw-r--r-- | db/schema.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/db/schema.rb b/db/schema.rb index c0d4fee..829ad0e 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20140405012548) do +ActiveRecord::Schema.define(version: 20140406015417) do create_table "alerts", force: true do |t| t.integer "author_id" @@ -24,7 +24,7 @@ ActiveRecord::Schema.define(version: 20140405012548) do create_table "game_settings", force: true do |t| t.integer "game_id" - t.integer "type" + t.integer "stype" t.string "name" t.text "default" t.text "description" |