Skip to content

Commit 14ef497

Browse files
JOYclaude
andcommitted
fix: resolve merge conflict for v10.0.1 (User-Agent header)
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 2ebb3a8 commit 14ef497

1 file changed

Lines changed: 0 additions & 4 deletions

File tree

apps/explorer/lib/explorer/token/metadata_retriever.ex

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,7 @@ defmodule Explorer.Token.MetadataRetriever do
1313
@no_uri_error "no uri"
1414
@vm_execution_error "VM execution error"
1515
@invalid_base64_data "invalid data:application/json;base64"
16-
<<<<<<< HEAD
17-
@default_headers [{"User-Agent", "blockscout-9.3.5"}]
18-
=======
1916
@default_headers [{"User-Agent", "blockscout-10.0.1"}]
20-
>>>>>>> v10.0.1
2117

2218
# https://eips.ethereum.org/EIPS/eip-1155#metadata
2319
@erc1155_token_id_placeholder "{id}"

0 commit comments

Comments
 (0)