Update DocSearch.js

carburo · web-flow · commit 8eedc7468882 · 2019-02-25T09:37:51.000-05:00
diff --git a/src/components/LayoutHeader/DocSearch.js b/src/components/LayoutHeader/DocSearch.js
@@ -97,11 +97,7 @@ class DocSearch extends Component<{}, State> {
           }}
           id="algolia-doc-search"
           type="search"
-<<<<<<< HEAD
           placeholder="Buscar"
-=======
-          placeholder="Search"
->>>>>>> bab2a3491a18e7074799272d60c8a159473bb7f5
           aria-label="Search docs"
         />
       </form>
