Resolve external contributors conflicts

Signed-off-by: Rémy Coutable <remy@rymai.me>

db/schema.rb

@@ -1582,12 +1582,9 @@ ActiveRecord::Schema.define(version: 20170525174156) do
     t.boolean "external", default: false
     t.string "incoming_email_token"
     t.string "organization"
-<<<<<<< HEAD
     t.boolean "authorized_projects_populated"
     t.boolean "auditor", default: false, null: false
     t.boolean "ghost"
-=======
->>>>>>> upstream/master
     t.boolean "require_two_factor_authentication_from_group", default: false, null: false
     t.integer "two_factor_grace_period", default: 48, null: false
     t.date "last_activity_on"

doc/api/projects.md

@@ -478,12 +478,9 @@ Parameters:
 | `only_allow_merge_if_all_discussions_are_resolved` | boolean | no | Set whether merge requests can only be merged when all the discussions are resolved |
 | `lfs_enabled` | boolean | no | Enable LFS |
 | `request_access_enabled` | boolean | no | Allow users to request member access |
-<<<<<<< HEAD
+| `tag_list`    | array   | no       | The list of tags for a project; put array of tags, that should be finally assigned to a project |
 | `repository_storage` | string | no | Which storage shard the repository is on. Available only to admins |
 | `approvals_before_merge` | integer | no | How many approvers should approve merge request by default |
-=======
-| `tag_list`    | array   | no       | The list of tags for a project; put array of tags, that should be finally assigned to a project |
->>>>>>> upstream/master
 
 ### Create project for user
 
@@ -516,12 +513,9 @@ Parameters:
 | `only_allow_merge_if_all_discussions_are_resolved` | boolean | no | Set whether merge requests can only be merged when all the discussions are resolved |
 | `lfs_enabled` | boolean | no | Enable LFS |
 | `request_access_enabled` | boolean | no | Allow users to request member access |
-<<<<<<< HEAD
+| `tag_list`    | array   | no       | The list of tags for a project; put array of tags, that should be finally assigned to a project |
 | `repository_storage` | string | no | Which storage shard the repository is on. Available only to admins |
 | `approvals_before_merge` | integer | no | How many approvers should approve merge request by default |
-=======
-| `tag_list`    | array   | no       | The list of tags for a project; put array of tags, that should be finally assigned to a project |
->>>>>>> upstream/master
 
 ### Edit project
 
@@ -554,12 +548,9 @@ Parameters:
 | `only_allow_merge_if_all_discussions_are_resolved` | boolean | no | Set whether merge requests can only be merged when all the discussions are resolved |
 | `lfs_enabled` | boolean | no | Enable LFS |
 | `request_access_enabled` | boolean | no | Allow users to request member access |
-<<<<<<< HEAD
+| `tag_list`    | array   | no       | The list of tags for a project; put array of tags, that should be finally assigned to a project |
 | `repository_storage` | string | no | Which storage shard the repository is on. Available only to admins |
 | `approvals_before_merge` | integer | no | How many approvers should approve merge request by default |
-=======
-| `tag_list`    | array   | no       | The list of tags for a project; put array of tags, that should be finally assigned to a project |
->>>>>>> upstream/master
 
 ### Fork project