diff options
| author | Tiago Botelho <tiagonbotelho@hotmail.com> | 2018-05-30 11:55:22 +0100 |
|---|---|---|
| committer | Tiago Botelho <tiagonbotelho@hotmail.com> | 2018-05-30 11:55:22 +0100 |
| commit | 31c455e442c7c0b416638088ad89b9a58bd4c4cb (patch) | |
| tree | 9a13392d226d4071e984769c676ea8dc32b6b9f4 | |
| parent | 7ed252c1e72d446883a5007d375d4404c3504b0c (diff) | |
| download | gitlab-ce-31c455e442c7c0b416638088ad89b9a58bd4c4cb.tar.gz | |
Fix schema conflict
| -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 c94bcc83b04..393114e3a3c 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: 20180508102840) do -======= ActiveRecord::Schema.define(version: 20180529093006) do ->>>>>>> 516c00763e... Merge branch 'ensure-remote-mirror-columns-in-ce' into 'master' # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" |