fix conflicts

1 files changed, 0 insertions, 30 deletions

diff --git a/ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-error/confirm-page-container-error.component.js b/ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-error/confirm-page-container-error.component.js
deleted file mode 100644
index 4965d7b4e..000000000
--- a/ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-error/confirm-page-container-error.component.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import React from 'react'
-import PropTypes from 'prop-types'
-
-const ConfirmPageContainerError = (props, context) => {
-  const { errorMessage, errorKey } = props
-  const error = errorKey ? context.t(errorKey) : errorMessage
-
-  return (
-    <div className="confirm-page-container-error">
-      <img
-        src="/images/alert-red.svg"
-        className="confirm-page-container-error__icon"
-      />
-      <div className="confirm-page-container-error__text">
-        { `ALERT: ${error}` }
-      </div>
-    </div>
-  )
-}
-
-ConfirmPageContainerError.propTypes = {
-  errorMessage: PropTypes.string,
-  errorKey: PropTypes.string,
-}
-
-ConfirmPageContainerError.contextTypes = {
-  t: PropTypes.func,
-}
-
-export default ConfirmPageContainerError