[CE->EE] Resolve conflicts

locale/gitlab.pot

@@ -8,13 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gitlab 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2017-09-27 16:26+0200\n"
-"PO-Revision-Date: 2017-09-27 16:26+0200\n"
-=======
 "POT-Creation-Date: 2017-09-28 13:28-0400\n"
 "PO-Revision-Date: 2017-09-28 13:28-0400\n"
->>>>>>> bdc50ed779cb0c7d266c0f80f3e66a25da8b1964
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -441,11 +436,7 @@ msgstr ""
 msgid "CiStatus|running"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "Close"
-=======
-msgid "Clone repository"
->>>>>>> bdc50ed779cb0c7d266c0f80f3e66a25da8b1964
 msgstr ""
 
 msgid "Comments"
@@ -1788,9 +1779,6 @@ msgstr ""
 msgid "Wiki"
 msgstr ""
 
-<<<<<<< HEAD
-msgid "With contribution analytics you can have an overview for the activity of issues, merge requests and push events of your organization and its members."
-=======
 msgid "WikiClone|Clone your wiki"
 msgstr ""
 
@@ -1888,7 +1876,6 @@ msgid "Wiki|Pages"
 msgstr ""
 
 msgid "Wiki|Wiki Pages"
->>>>>>> bdc50ed779cb0c7d266c0f80f3e66a25da8b1964
 msgstr ""
 
 msgid "Withdraw Access Request"

spec/lib/gitlab/shell_spec.rb

@@ -474,11 +474,7 @@ describe Gitlab::Shell do
         end
       end
 
-<<<<<<< HEAD
       context 'with gitlay' do
-=======
-      context 'with gitaly' do
->>>>>>> bdc50ed779cb0c7d266c0f80f3e66a25da8b1964
         it_behaves_like '#add_repository'
       end
 

spec/lib/gitlab/workhorse_spec.rb

@@ -226,12 +226,9 @@ describe Gitlab::Workhorse do
       it 'includes a Repository param' do
         repo_param = {
           storage_name: 'default',
-<<<<<<< HEAD
           relative_path: project.full_path + '.git'
-=======
           relative_path: project.full_path + '.git',
           gl_repository: "project-#{project.id}"
->>>>>>> bdc50ed779cb0c7d266c0f80f3e66a25da8b1964
         }
 
         expect(subject[:Repository]).to include(repo_param)

spec/policies/namespace_policy_spec.rb

 require 'spec_helper'
 
 describe NamespacePolicy do
-<<<<<<< HEAD
   let(:user) { create(:user) }
   let(:owner) { create(:user) }
   let(:auditor) { create(:user, :auditor) }
@@ -50,22 +49,5 @@ describe NamespacePolicy do
     let(:current_user) { admin }
 
     it { is_expected.to be_allowed(*owner_permissions) }
-=======
-  let(:current_user) { create(:user) }
-  let(:namespace) { current_user.namespace }
-
-  subject { described_class.new(current_user, namespace) }
-
-  context "create projects" do
-    context "user namespace" do
-      it { is_expected.to be_allowed(:create_projects) }
-    end
-
-    context "user who has exceeded project limit" do
-      let(:current_user) { create(:user, projects_limit: 0) }
-
-      it { is_expected.not_to be_allowed(:create_projects) }
-    end
->>>>>>> bdc50ed779cb0c7d266c0f80f3e66a25da8b1964
   end
 end