diff options
Diffstat (limited to 'db/schema.rb')
| -rw-r--r-- | db/schema.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/db/schema.rb b/db/schema.rb index 792b42258..443fe0579 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,11 @@ # # It's strongly recommended that you check this file into your version control system. +<<<<<<< HEAD +ActiveRecord::Schema.define(version: 20170928144740) do +======= ActiveRecord::Schema.define(version: 20171002080526) do +>>>>>>> eaf5b3fd868d68856ef94e18656dac39096d866b # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -164,7 +168,10 @@ ActiveRecord::Schema.define(version: 20171002080526) do t.datetime "created_at", null: false t.datetime "updated_at", null: false t.string "status" +<<<<<<< HEAD +======= t.integer "compliance_check_set_id" +>>>>>>> eaf5b3fd868d68856ef94e18656dac39096d866b end add_index "compliance_check_messages", ["compliance_check_id"], name: "index_compliance_check_messages_on_compliance_check_id", using: :btree |