From 1323a360c2e36e4740ac23d3e148ee2672ef2310 Mon Sep 17 00:00:00 2001
From: maxgrapps <50101080+maxgrapps@users.noreply.github.com>
Date: Thu, 23 May 2019 11:17:14 +0300
Subject: [PATCH] Update default.pot

---
 apps/block_scout_web/priv/gettext/default.pot | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot
index f55bc54589..bcaa5614b5 100644
--- a/apps/block_scout_web/priv/gettext/default.pot
+++ b/apps/block_scout_web/priv/gettext/default.pot
@@ -1706,13 +1706,8 @@ msgid "of"
 msgstr ""
 
 #, elixir-format
-<<<<<<< HEAD
-<<<<<<< HEAD
 #: lib/block_scout_web/templates/block_transaction/404.html.eex:7
 msgid "Block Details"
-=======
-=======
->>>>>>> 59d33a42ddf629ec042ae03fa17818f4c6eb8211
 #: lib/block_scout_web/templates/address_contract/index.html.eex:83
 msgid "Contract Byte Code"
 msgstr ""
@@ -1740,8 +1735,4 @@ msgstr ""
 #, elixir-format
 #: lib/block_scout_web/templates/address_logs/index.html.eex:77
 msgid "There are no logs for this address."
-<<<<<<< HEAD
->>>>>>> 59d33a42ddf629ec042ae03fa17818f4c6eb8211
-=======
->>>>>>> 59d33a42ddf629ec042ae03fa17818f4c6eb8211
 msgstr ""