Resolve text_utility_spec.js

spec/javascripts/lib/utils/text_utility_spec.js

@@ -55,17 +55,13 @@ describe('text_utility', () => {
     });
   });
 
-<<<<<<< HEAD
   describe('capitalizeFirstCharacter', () => {
     it('returns string with first letter capitalized', () => {
       expect(textUtils.capitalizeFirstCharacter('gitlab')).toEqual('Gitlab');
     });
   });
 
-  describe('stripeHtml', () => {
-=======
   describe('stripHtml', () => {
->>>>>>> upstream/master
     it('replaces html tag with the default replacement', () => {
       expect(textUtils.stripHtml('This is a text with <p>html</p>.')).toEqual('This is a text with html.');
     });