Fix bad conflict resolution

0bcafc97 · Lin Jen-Shin · 66d9c51a · 0bcafc97
Commit 0bcafc97 authored Jul 05, 2017 by Lin Jen-Shin
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

spec/models/ee/project_spec.rb spec/models/ee/project_spec.rb +0 -1

No files found.
--- a/spec/models/ee/project_spec.rb
+++ b/spec/models/ee/project_spec.rb
@@ -311,7 +311,6 @@ describe Project, models: true do
    end
  end

-<<<<<<< HEAD
  describe '#secret_variables_for' do
    let(:project) { create(:empty_project) }