diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-01-16 17:08:03 -0800 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-01-16 17:08:03 -0800 |
| commit | 3f2df9c366d80b58209e2028a3bfe4e66c6b483c (patch) | |
| tree | 2e7b1c92aad7a2a9ae744f1308759266dffef7e0 /db | |
| parent | de3b9b9fb508636c527bbb1de33614dcfdf80e6e (diff) | |
| download | gitlab-ce-3f2df9c366d80b58209e2028a3bfe4e66c6b483c.tar.gz | |
Resolve conflicts in VERSION, db/schema.rb, and spec/models/service_spec.rb
Diffstat (limited to 'db')
| -rw-r--r-- | db/schema.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/db/schema.rb b/db/schema.rb index 25583170851..13913b49902 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,11 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -<<<<<<< HEAD ActiveRecord::Schema.define(version: 20180105212544) do -======= -ActiveRecord::Schema.define(version: 20171215121259) do ->>>>>>> Merge branch 'sh-migrate-can-push-to-deploy-keys-projects-10-3' into 'security-10-3' # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" |