resolve db/schema.rb, spec/models/issue_spec.rb, and locale/gitlab.pot

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: 20180920043317) do
-=======
-ActiveRecord::Schema.define(version: 20180914201132) do
->>>>>>> 0d2e3b56b1bc175ef1d348d01eb8dfa3ac206ccb
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"

locale/gitlab.pot

@@ -939,12 +939,9 @@ msgstr ""
 msgid "Background Jobs"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "Background color"
 msgstr ""
 
-=======
->>>>>>> 0d2e3b56b1bc175ef1d348d01eb8dfa3ac206ccb
 msgid "Badges"
 msgstr ""
 
@@ -2969,7 +2966,6 @@ msgstr ""
 msgid "Environments|You don't have any environments right now."
 msgstr ""
 
-<<<<<<< HEAD
 msgid "Environments|protected"
 msgstr ""
 
@@ -3009,11 +3005,9 @@ msgstr ""
 msgid "Epics|start"
 msgstr ""
 
-=======
 msgid "Epic"
 msgstr ""
 
->>>>>>> 0d2e3b56b1bc175ef1d348d01eb8dfa3ac206ccb
 msgid "Error"
 msgstr ""
 

spec/models/issue_spec.rb

@@ -90,7 +90,6 @@ describe Issue do
     it 'sets closed_at to Time.now when an issue is closed' do
       expect { issue.close }.to change { issue.closed_at }.from(nil)
     end
-<<<<<<< HEAD
 
     it 'changes the state to closed' do
       expect { issue.close }.to change { issue.state }.from('opened').to('closed')
@@ -101,18 +100,6 @@ describe Issue do
     let(:user) { create(:user) }
     let(:issue) { create(:issue, state: 'closed', closed_at: Time.now, closed_by: user) }
 
-=======
-
-    it 'changes the state to closed' do
-      expect { issue.close }.to change { issue.state }.from('opened').to('closed')
-    end
-  end
-
-  describe '#reopen' do
-    let(:user) { create(:user) }
-    let(:issue) { create(:issue, state: 'closed', closed_at: Time.now, closed_by: user) }
-
->>>>>>> 0d2e3b56b1bc175ef1d348d01eb8dfa3ac206ccb
     it 'sets closed_at to nil when an issue is reopend' do
       expect { issue.reopen }.to change { issue.closed_at }.to(nil)
     end