Fix conflicts in issue_warning_spec.js

spec/javascripts/vue_shared/components/issue/issue_warning_spec.js

@@ -16,11 +16,7 @@ describe('Issue Warning Component', () => {
         isLocked: true,
       });
 
-<<<<<<< HEAD
-      expect(vm.$el.querySelector('i').className).toEqual('fa fa-lock');
-=======
       expect(vm.$el.querySelector('i').className).toEqual('fa icon fa-lock');
->>>>>>> ce-com/master
       expect(formatWarning(vm.$el.querySelector('span').textContent)).toEqual('This issue is locked. Only project members can comment.');
     });
   });
@@ -31,11 +27,7 @@ describe('Issue Warning Component', () => {
         isConfidential: true,
       });
 
-<<<<<<< HEAD
-      expect(vm.$el.querySelector('i').className).toEqual('fa fa-eye-slash');
-=======
       expect(vm.$el.querySelector('i').className).toEqual('fa icon fa-eye-slash');
->>>>>>> ce-com/master
       expect(formatWarning(vm.$el.querySelector('span').textContent)).toEqual('This is a confidential issue. Your comment will not be visible to the public.');
     });
   });