resolve conflict in spec/javascripts/lib/utils/text_utility_spec.js

spec/javascripts/lib/utils/text_utility_spec.js

@@ -55,15 +55,12 @@ describe('text_utility', () => {
     });
   });
 
-<<<<<<< HEAD
   describe('capitalizeFirstCharacter', () => {
     it('returns string with first letter capitalized', () => {
       expect(textUtils.capitalizeFirstCharacter('gitlab')).toEqual('Gitlab');
     });
   });
 
-=======
->>>>>>> upstream/master
   describe('slugifyWithHyphens', () => {
     it('should replaces whitespaces with hyphens and convert to lower case', () => {
       expect(textUtils.slugifyWithHyphens('My Input String')).toEqual('my-input-string');