diff options
| author | James Edwards-Jones <jedwardsjones@gitlab.com> | 2018-04-03 15:48:09 +0100 |
|---|---|---|
| committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2018-04-03 15:48:09 +0100 |
| commit | 35600d7e8b1d2c31aced9c87b1639bcbc39c6cb3 (patch) | |
| tree | 6149bbb9621fa97db51899fbcdcfc78fd89d699a | |
| parent | 1a8d6f6f38c1d8d9b977e658105091eddc5ec67e (diff) | |
| download | gitlab-ce-35600d7e8b1d2c31aced9c87b1639bcbc39c6cb3.tar.gz | |
Fix schema.rb 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 c89ce2da87c..3f1696e64f7 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: 20180223144945) do -======= -ActiveRecord::Schema.define(version: 20180122154930) do ->>>>>>> 2b1e4b399c5... Merge branch 'jej/mattermost-notification-confidentiality' into 'security-10-4' # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" |