diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-28 18:03:03 +0300 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-28 18:03:03 +0300 |
| commit | 3a3cf07f93b6b902f9a8a3ebb6dfeb6eaf12ae18 (patch) | |
| tree | 116a816924013a0babc411ceb57ad3aa56ce6fc4 /db/schema.rb | |
| parent | 97633d561681a5c0f55472c1372bedca5fe3bffe (diff) | |
| parent | 61046e75d8e6f660e55f4f7b5a76238611a0f48f (diff) | |
Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vue
Diffstat (limited to 'db/schema.rb')
| -rw-r--r-- | db/schema.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/db/schema.rb b/db/schema.rb index a9940be22ff..81cd32e2d83 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: 20170428123910) do +======= +ActiveRecord::Schema.define(version: 20170426181740) do +>>>>>>> origin/master # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" |