fixed merge conflict and fixed number formatting

6 years ago · 8611ec46d2
parent 475b368ae5
commit 8611ec46d2
1 changed files with 2 additions and 4 deletions
--- a/apps/block_scout_web/priv/gettext/default.pot
+++ b/apps/block_scout_web/priv/gettext/default.pot
@ -558,13 +558,11 @@ msgstr ""
 msgid "Last Updated In Block"
 msgstr ""

-#, elixir-format
-#: lib/block_scout_web/templates/smart_contract/_functions.html.eex:51
+#: lib/block_scout_web/templates/smart_contract/_functions.html.eex:49
 msgid "WEI"
 msgstr ""

-#, elixir-format
-#: lib/block_scout_web/templates/smart_contract/_functions.html.eex:52
+#: lib/block_scout_web/templates/smart_contract/_functions.html.eex:50
 msgid "ETH"
 msgstr ""