diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-03 23:40:51 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-03 23:40:51 -0500 |
| commit | 9f246b9ec386ccb5e6665408d050cf71fc336283 (patch) | |
| tree | 200208753b12ad269b7512da6c9278470584f159 /db/schema.rb | |
| parent | b8ed86ee1276eba4df8a321e81de5d9570a32850 (diff) | |
| parent | 11e4de6fd8235b1877b1725d53a98f017130c768 (diff) | |
Merge branch 'clean'
Conflicts:
generate.sh
Diffstat (limited to 'db/schema.rb')
| -rw-r--r-- | db/schema.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/db/schema.rb b/db/schema.rb index eb44d71..1f844f5 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: 20140304041720) do +ActiveRecord::Schema.define(version: 20140304043700) do create_table "alerts", force: true do |t| t.integer "author_id" |