From d0bb54ac58d968244c2b4a559d0ff3dd20f127f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luciano=20J=C3=BAnior?= <luciannojunior@gmail.com>
Date: Mon, 1 Oct 2018 08:39:00 -0300
Subject: [PATCH] Fixing conflicts

---
 react/ProductContextProvider.js | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/react/ProductContextProvider.js b/react/ProductContextProvider.js
index 496a16c5..982450b4 100644
--- a/react/ProductContextProvider.js
+++ b/react/ProductContextProvider.js
@@ -45,24 +45,10 @@ class ProductContextProvider extends Component {
   }
 
   componentDidMount() {
-<<<<<<< HEAD
     const { prefetchPage } = this.props.runtime
-    const {
-      params: { slug },
-    } = this.props
     prefetchPage('store/home')
     prefetchPage('store/search')
-    const loading = this.loading()
-    const product = this.product()
-    if (!product && !loading) {
-      this.props.runtime.navigate({
-        page: 'store/search',
-        params: { term: slug },
-      })
-    }
-=======
     this.checkNotFoundProduct();
->>>>>>> Fixing ProductNotFound Redirection
   }
 
   componentDidUpdate() {
@@ -74,11 +60,7 @@ class ProductContextProvider extends Component {
   }
 
   getData = () => {
-<<<<<<< HEAD
     const { query, runtime: { account } } = this.props
-=======
-    const { query } = this.props
->>>>>>> Fixing ProductNotFound Redirection
     const product = this.product()
     const {
       titleTag,