Fix misc conflicts

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

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: 20170308015651) do
-=======
 ActiveRecord::Schema.define(version: 20170313133418) do
->>>>>>> ce/master
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"

doc/api/issues.md

@@ -333,21 +333,6 @@ Creates a new project issue.
 POST /projects/:id/issues
 ```
 
-<<<<<<< HEAD
-| Attribute | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `id`            | integer | yes | The ID of a project |
-| `title`         | string  | yes | The title of an issue |
-| `description`   | string  | no  | The description of an issue  |
-| `confidential`  | boolean | no  | Set an issue to be confidential. Default is `false`.  |
-| `assignee_id`   | integer | no  | The ID of a user to assign issue |
-| `milestone_id`  | integer | no  | The ID of a milestone to assign issue |
-| `labels`        | string  | no  | Comma-separated label names for an issue  |
-| `created_at`    | string  | no  | Date time string, ISO 8601 formatted, e.g. `2016-03-11T03:45:40Z` (requires admin or project owner rights) |
-| `due_date`      | string  | no  | Date time string in the format YEAR-MONTH-DAY, e.g. `2016-03-11` |
-| `merge_request_for_resolving_discussions` | integer | no       | The IID of a merge request in which to resolve all issues. This will fill the issue with a default description and mark all discussions as resolved. When passing a description or title, these values will take precedence over the default values. |
-| `weight` | integer | no | The weight of the issue in range 0 to 9 |
-=======
 | Attribute                                 | Type    | Required | Description                                                                                                                                                                                                                                          |
 | ---------                                 | ----    | -------- | -----------                                                                                                                                                                                                                                          |
 | `id`                                      | integer | yes      | The ID of a project                                                                                                                                                                                                                                  |
@@ -361,7 +346,7 @@ POST /projects/:id/issues
 | `due_date`                                | string  | no       | Date time string in the format YEAR-MONTH-DAY, e.g. `2016-03-11`                                                                                                                                                                                     |
 | `merge_request_to_resolve_discussions_of` | integer | no       | The IID of a merge request in which to resolve all issues. This will fill the issue with a default description and mark all discussions as resolved. When passing a description or title, these values will take precedence over the default values. |
 | `discussion_to_resolve`                   | string  | no       | The ID of a discussion to resolve. This will fill in the issue with a default description and mark the discussion as resolved. Use in combination with `merge_request_to_resolve_discussions_of`.                                                    |
->>>>>>> ce/master
+| `weight` | integer | no | The weight of the issue in range 0 to 9 |
 
 ```bash
 curl --request POST --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v4/projects/4/issues?title=Issues%20with%20auth&labels=bug

lib/gitlab/checks/change_access.rb

 module Gitlab
   module Checks
     class ChangeAccess
-<<<<<<< HEAD
       include PathLocksHelper
 
-=======
->>>>>>> ce/master
       # protocol is currently used only in EE
       attr_reader :user_access, :project, :skip_authorization, :protocol
 

lib/gitlab/git_access.rb

@@ -195,13 +195,6 @@ module Gitlab
         skip_authorization: deploy_key?,
         protocol: protocol
       ).exec
-<<<<<<< HEAD
-=======
-    end
-
-    def matching_merge_request?(newrev, branch_name)
-      Checks::MatchingMergeRequest.new(newrev, branch_name, project).match?
->>>>>>> ce/master
     end
 
     def deploy_key