diff options
| author | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-08-07 15:21:28 +0300 |
|---|---|---|
| committer | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-08-07 16:09:14 +0300 |
| commit | 2e6aa4f25e14fa7e57ea9f271e302e291ecc9e05 (patch) | |
| tree | 4ff6c04b4871ec10ebe563c1d055a77ac589c495 /spec/features/projects_spec.rb | |
| parent | aae947cb1c1252a642e0464c61132ec2e965eb80 (diff) | |
After merge cleanup
Diffstat (limited to 'spec/features/projects_spec.rb')
| -rw-r--r-- | spec/features/projects_spec.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/spec/features/projects_spec.rb b/spec/features/projects_spec.rb index 48805de2f3b..c2ad3a25365 100644 --- a/spec/features/projects_spec.rb +++ b/spec/features/projects_spec.rb @@ -1,7 +1,6 @@ require 'spec_helper' -<<<<<<< HEAD -feature 'Project', feature: true do +feature 'Project' do describe 'creating from template' do let(:user) { create(:user) } let(:template) { Gitlab::ProjectTemplate.find(:rails) } @@ -23,9 +22,6 @@ feature 'Project', feature: true do end end -======= -feature 'Project' do ->>>>>>> master describe 'description' do let(:project) { create(:project, :repository) } let(:path) { project_path(project) } |