From 8d4493280397cbdbd6a91993f0e3ac00c1c15000 Mon Sep 17 00:00:00 2001
From: Gabriel Rodriguez Alsina <gabriel.rodriguez@altoros.com>
Date: Thu, 21 Mar 2019 12:40:02 -0300
Subject: [PATCH] (fix) conflict

---
 .../lib/block_scout_web/templates/layout/_topnav.html.eex     | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex
index 45e1fbe9c7..faa8344e2a 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex
@@ -121,11 +121,7 @@
       <div class="search-form d-lg-flex d-inline-block">
         <%= form_for @conn, chain_path(@conn, :search), [class: "form-inline my-2 my-lg-0", method: :get, enforce_utf8: false], fn f -> %>
           <div class="input-group">
-<<<<<<< HEAD
-            <%= search_input f, :q, class: 'form-control mr-auto', placeholder: gettext("Search by address, transaction hash, or block number"), "aria-describedby": "search-icon", "aria-label": gettext("Search by address, transaction, block"), "data-test": "search_input" %>
-=======
             <%= search_input f, :q, class: 'form-control mr-auto', placeholder: gettext("Search by address, token symbol name, transaction hash, or block number"), "aria-describedby": "search-icon", "aria-label": gettext("Search"), "data-test": "search_input" %>
->>>>>>> master
             <div class="input-group-append">
               <button class="input-group-text" id="search-icon">
                 <%= render BlockScoutWeb.IconsView, "_search_icon.html" %>