fixed merge conflict and fixed number formatting

6 years ago · 8cf1a7becc
parent faae82efb5
commit 8cf1a7becc
1 changed files with 0 additions and 10 deletions
--- a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
+++ b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
@ -1284,13 +1284,3 @@ msgstr ""
 #: lib/block_scout_web/templates/address_token_transfer/index.html.eex:128
 msgid "There are no token transfers for this address."
 msgstr ""
-
-#, elixir-format
-#: lib/block_scout_web/templates/smart_contract/_functions.html.eex:51
-msgid "WEI"
-msgstr ""
-
-#, elixir-format
-#: lib/block_scout_web/templates/smart_contract/_functions.html.eex:52
-msgid "ETH"
-msgstr ""