Fix snapshot

vmware-tanzu · Aug 27, 2018 · d19ecbe · d19ecbe
1 parent cc9279f
commit d19ecbe
Showing 1 changed file with 0 additions and 43 deletions.
diff --git a/dashboard/src/components/LoginForm/__snapshots__/LoginForm.test.tsx.snap b/dashboard/src/components/LoginForm/__snapshots__/LoginForm.test.tsx.snap
@@ -1,10 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-<<<<<<< HEAD
-exports[`displays an error if the authenticate handler throws an error 1`] = `
-=======
 exports[`displays an error if the authentication error is passed 1`] = `
->>>>>>> In redux store
 <section
   className="LoginForm"
 >
@@ -19,44 +15,6 @@ exports[`displays an error if the authentication error is passed 1`] = `
         role="alert"
       >
         There was an error connecting to the Kubernetes API. Please check that your token is valid.
-<<<<<<< HEAD
-        <button
-          className="alert__close"
-          onClick={[Function]}
-        >
-          <X
-            color="currentColor"
-            size="24"
-          />
-        </button>
-      </div>
-    </div>
-    <div
-      className="bg-skew__pattern bg-skew__pattern-dark type-color-reverse"
-    >
-      <div
-        className="container"
-      >
-        <h2>
-          <Lock
-            color="currentColor"
-            size="24"
-          />
-           Login
-        </h2>
-        <p>
-          Your cluster operator should provide you with a Kubernetes API token.
-
-          <a
-            href="https://github.com/kubeapps/kubeapps/blob/master/docs/user/access-control.md"
-            target="_blank"
-          >
-            Click here
-          </a>
-
-          for more info on how to create and use Bearer Tokens.
-        </p>
-=======
       </div>
     </div>
     <div
@@ -196,4 +154,3 @@ exports[`renders a token login form 1`] = `
   </div>
 </section>
 `;
->>>>>>> In redux store