chore: resolve conflicts

alainncls · alainncls · commit 43a7502e179b · 2025-11-24T11:06:07.000+01:00
diff --git a/json/linea-mainnet-token-shortlist.json b/json/linea-mainnet-token-shortlist.json
@@ -7,7 +7,7 @@
   "versions": [
     {
       "major": 1,
-      "minor": 63,
+      "minor": 64,
       "patch": 0
     }
   ],
@@ -858,8 +858,8 @@
       "name": "TATERZ",
       "symbol": "TATERZ",
       "decimals": 18,
-      "createdAt": "2025-11-10T13:35:04.174Z",
-      "updatedAt": "2025-11-10T13:35:04.174Z",
+      "createdAt": "2025-11-10",
+      "updatedAt": "2025-11-10",
       "logoURI": "https://images.ctfassets.net/4j2tco9amoqh/1jGcrN7biBE7xE3Qx2PEaN/6fbf788b4c68a54c994a3cd1d7420ad9/image.png"
     },
     {

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`"versions": [`
`8`	`8`	`{`
`9`	`9`	`"major": 1,`
`10`		`- "minor": 63,`
	`10`	`+ "minor": 64,`
`11`	`11`	`"patch": 0`
`12`	`12`	`}`
`13`	`13`	`],`
`@@ -858,8 +858,8 @@`
`858`	`858`	`"name": "TATERZ",`
`859`	`859`	`"symbol": "TATERZ",`
`860`	`860`	`"decimals": 18,`
`861`		`- "createdAt": "2025-11-10T13:35:04.174Z",`
`862`		`- "updatedAt": "2025-11-10T13:35:04.174Z",`
	`861`	`+ "createdAt": "2025-11-10",`
	`862`	`+ "updatedAt": "2025-11-10",`
`863`	`863`	`"logoURI": "https://images.ctfassets.net/4j2tco9amoqh/1jGcrN7biBE7xE3Qx2PEaN/6fbf788b4c68a54c994a3cd1d7420ad9/image.png"`
`864`	`864`	`},`
`865`	`865`	`{`