Resolve conflicts in spec/javascripts/clusters/clusters_bundle_spec.js

spec/javascripts/clusters/clusters_bundle_spec.js

@@ -84,14 +84,9 @@ describe('Clusters', () => {
         helm: { status: APPLICATION_INSTALLED, title: 'Helm Tiller' },
       });
 
-<<<<<<< HEAD
-      expect(document.querySelector('.js-cluster-application-notice .flash-text')).toBeDefined();
-      expect(document.querySelector('.js-cluster-application-notice .flash-text').textContent.trim()).toEqual('Helm Tiller was successfully installed on your Kubernetes cluster');
-=======
       const flashMessage = document.querySelector('.js-cluster-application-notice .flash-text');
       expect(flashMessage).not.toBeNull();
       expect(flashMessage.textContent.trim()).toEqual('Helm Tiller was successfully installed on your Kubernetes cluster');
->>>>>>> upstream/master
     });
 
     it('shows an alert when multiple things gets newly installed', () => {
@@ -105,14 +100,9 @@ describe('Clusters', () => {
         ingress: { status: APPLICATION_INSTALLED, title: 'Ingress' },
       });
 
-<<<<<<< HEAD
-      expect(document.querySelector('.js-cluster-application-notice .flash-text')).toBeDefined();
-      expect(document.querySelector('.js-cluster-application-notice .flash-text').textContent.trim()).toEqual('Helm Tiller, Ingress was successfully installed on your Kubernetes cluster');
-=======
       const flashMessage = document.querySelector('.js-cluster-application-notice .flash-text');
       expect(flashMessage).not.toBeNull();
       expect(flashMessage.textContent.trim()).toEqual('Helm Tiller, Ingress was successfully installed on your Kubernetes cluster');
->>>>>>> upstream/master
     });
   });