Resolve conflict in spec/requests/api/v3/builds_spec.rb

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

spec/requests/api/boards_spec.rb

 require 'spec_helper'
 
 describe API::Boards do
-<<<<<<< HEAD
-  let(:user)        { create(:user) }
-  let(:non_member)  { create(:user) }
-  let(:guest)       { create(:user) }
-  let(:admin)       { create(:user, :admin) }
-  let!(:project)    { create(:project, :public, creator_id: user.id, namespace: user.namespace ) }
-
-  # EE only
-  let(:milestone)   { create(:milestone, project: project) }
-
-  let!(:dev_label) do
-=======
   set(:user)        { create(:user) }
-  set(:user2)       { create(:user) }
   set(:non_member)  { create(:user) }
   set(:guest)       { create(:user) }
   set(:admin)       { create(:user, :admin) }
   set(:project)    { create(:project, :public, creator_id: user.id, namespace: user.namespace ) }
 
   set(:dev_label) do
->>>>>>> upstream/master
     create(:label, title: 'Development', color: '#FFAABB', project: project)
   end
 
@@ -41,13 +27,11 @@ describe API::Boards do
     create(:list, label: test_label, position: 2)
   end
 
-<<<<<<< HEAD
-  let!(:board) do
-    create(:board, project: project, milestone: milestone, lists: [dev_list, test_list])
-=======
+  # EE only
+  set(:milestone) { create(:milestone, project: project) }
+
   set(:board) do
-    create(:board, project: project, lists: [dev_list, test_list])
->>>>>>> upstream/master
+    create(:board, project: project, milestone: milestone, lists: [dev_list, test_list])
   end
 
   before do

spec/requests/api/v3/builds_spec.rb

@@ -3,21 +3,12 @@ require 'spec_helper'
 describe API::V3::Builds do
   set(:user) { create(:user) }
   let(:api_user) { user }
-<<<<<<< HEAD
   let!(:project) { create(:project, :repository, creator: user, public_builds: false) }
   let!(:developer) { create(:project_member, :developer, user: user, project: project) }
   let(:reporter) { create(:project_member, :reporter, project: project) }
   let(:guest) { create(:project_member, :guest, project: project) }
   let(:pipeline) { create(:ci_empty_pipeline, project: project, sha: project.commit.id, ref: project.default_branch) }
   let(:build) { create(:ci_build, pipeline: pipeline) }
-=======
-  set(:project) { create(:project, :repository, creator: user, public_builds: false) }
-  set(:developer) { create(:project_member, :developer, user: user, project: project) }
-  set(:reporter) { create(:project_member, :reporter, project: project) }
-  set(:guest) { create(:project_member, :guest, project: project) }
-  set(:pipeline) { create(:ci_empty_pipeline, project: project, sha: project.commit.id, ref: project.default_branch) }
-  let!(:build) { create(:ci_build, pipeline: pipeline) }
->>>>>>> upstream/master
 
   describe 'GET /projects/:id/builds ' do
     let(:query) { '' }