Resolve conflicts

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

app/assets/javascripts/project_select.js

@@ -55,12 +55,9 @@ import Api from './api';
         this.includeGroups = $(select).data('include-groups');
         this.allProjects = $(select).data('allprojects') || false;
         this.orderBy = $(select).data('order-by') || 'id';
-<<<<<<< HEAD
         this.withIssuesEnabled = $(select).data('with-issues-enabled');
         this.withMergeRequestsEnabled = $(select).data('with-merge-requests-enabled');
-=======
         idAttribute = $(select).data('idattribute') || 'web_url';
->>>>>>> origin/master
 
         placeholder = "Search for project";
         if (this.includeGroups) {
@@ -97,12 +94,9 @@ import Api from './api';
               } else {
                 return Api.projects(query.term, {
                   order_by: _this.orderBy,
-<<<<<<< HEAD
                   with_issues_enabled: _this.withIssuesEnabled,
-                  with_merge_requests_enabled: _this.withMergeRequestsEnabled
-=======
+                  with_merge_requests_enabled: _this.withMergeRequestsEnabled,
                   membership: !_this.allProjects
->>>>>>> origin/master
                 }, projectsCallback);
               }
             };

app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js

@@ -4,10 +4,7 @@ import { getStateKey } from '../dependencies';
 export default class MergeRequestStore {
   constructor(data) {
     this.sha = data.diff_head_sha;
-<<<<<<< HEAD
     this.gitlabLogo = data.gitlabLogo;
-=======
->>>>>>> origin/master
 
     this.setData(data);
   }

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

spec/models/merge_request_spec.rb

@@ -564,11 +564,7 @@ describe MergeRequest, models: true do
       project.team << [developer, :developer]
       project.team << [blocked_developer, :developer]
 
-<<<<<<< HEAD
-      expect(merge_request.number_of_potential_approvers).to eq(2)
-=======
-      expect(merge_request.reload.number_of_potential_approvers).to eq(1)
->>>>>>> origin/master
+      expect(merge_request.reload.number_of_potential_approvers).to eq(2)
     end
 
     context "when the project is part of a group" do