Resolve conflicts in issues_filter_spec.rb

1 files changed, 1 insertions, 7 deletions

diff --git a/spec/features/dashboard/issues_filter_spec.rb b/spec/features/dashboard/issues_filter_spec.rb
index b15f3afca4a..bab34ac9346 100644
--- a/spec/features/dashboard/issues_filter_spec.rb
+++ b/spec/features/dashboard/issues_filter_spec.rb
@@ -79,19 +79,13 @@ feature 'Dashboard Issues filtering', :js do
   end
 
   context 'sorting' do
-<<<<<<< HEAD
-    it 'shows sorted issues' do
-      sort_by('Created date')
-      visit_issues
-=======
     before do
       visit_issues(assignee_id: user.id)
     end
 
     it 'remembers last sorting value' do
-      sorting_by('Created date')
+      sort_by('Created date')
       visit_issues(assignee_id: user.id)
->>>>>>> Fixed dashboard filtering tests
 
       expect(find('.issues-filters')).to have_content('Created date')
     end