fix(ERCS/erc-7517.md): update EIP-7053 example

Signed-off-by: Bofu Chen (bafu) <bofu@numbersprotocol.io>
ethereum · Nov 27, 2023 · abd619e · abd619e
1 parent 9b2cc05
commit abd619e
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/ERCS/erc-7517.md b/ERCS/erc-7517.md
@@ -156,7 +156,6 @@ We can put the `dataMiningPreference` field in the NFT metadata below. The `lice
 
 The example using the `dataMiningPreference` property in onchain media provenance registration defined in [ERC-7053](./erc-7053.md).
 
-<<<<<<< HEAD
 Assuming the Decentralized Content Identifier (CID) is `bafyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa`. We can put the `dataMiningPreference` field in the Commit data directly. After following up the CID, got the Commit data:
 
 ```json
@@ -184,9 +183,6 @@ We can also put the `dataMiningPreference` field in any custom metadata whose CI
 ```
 
 Following up the `assetTreeCid` which describes the custom properties of the registered asset:
-=======
-Assume the Decentralized Content Identifier (CID) is `bafyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa`, and after following up the CID, got the Commit data:
->>>>>>> 4eb2d8c017e2b803225c426eb6f417ced262f6e6
 
 ```json
 {