Fix bad conflict resolution

b2ec0bf8 · Lin Jen-Shin · 5775bc76 · b2ec0bf8
Commit b2ec0bf8 authored Apr 10, 2017 by Lin Jen-Shin
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

spec/models/project_spec.rb spec/models/project_spec.rb +0 -2

No files found.
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -1678,8 +1678,6 @@ describe Project, models: true do
      project.add_import_job
      expect(project.reload.import_status).to eq('finished')
-=======
->>>>>>> 9-1-stable
    end
  end