From 730665da15bc98f6d7deef91ce964d11d2794ad5 Mon Sep 17 00:00:00 2001 From: likebad Date: Sun, 19 Jun 2022 16:15:31 +0200 Subject: [PATCH 1/5] remove conflict --- .../like-waiting.png | Bin 0 -> 29539 bytes src/tokens/solana.tokenlist.json | 5 ++++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 assets/mainnet/CUR9kjRj86tD8Yb19hzoL182bz5U2CuFbkBNBbDVgQVk/like-waiting.png diff --git a/assets/mainnet/CUR9kjRj86tD8Yb19hzoL182bz5U2CuFbkBNBbDVgQVk/like-waiting.png b/assets/mainnet/CUR9kjRj86tD8Yb19hzoL182bz5U2CuFbkBNBbDVgQVk/like-waiting.png new file mode 100644 index 0000000000000000000000000000000000000000..93779734e458eca0a6d03768029e421265ad8645 GIT binary patch literal 29539 zcmeI5-%C?*7{IY6ih%7XIL9n&mcKs9|jFM!H!8lXep*Xw5eCq!<1H(M1%`#cl?>*mlnQec$JO zp3fPwwjR$>?N$*&a+;f%HbUgW_Dh+$_0Gex0v{p8q?xI+_m6#kUzc-`(J=4ILZ3__ zdVxB}XSdh|VsyHq?uF_*h4RshmZf;IMq1ac52Vsz$InvU9A1o9Y$R4*c05SF_Fst4 zIsE>~6l)i~Ju{mYLpWMYydrlcz}_-f8U)q+275bNY!}lLfk#%UOjY%*yGWn=R@bg* zq`PHvytiF9c*5t%^Av~@BU9X+k?*5YE|HrKR0u!PZZTwytPN9d>NmpW0@vH;WNIBJ zi}d*(`lFvebyj0Y_-tI)w4|jA`)Ac7%GKeB{5~}s_^|dgl3hQ^8dX)o0dF}@WfnMde1ne9#PFx?q_RLhmG$%g&uhUgd>myLF@&ACZx9z zRYNWhAw(oD5idoS7Qtbpr2qX$_<8q!{f-v^S$G8hK{)`w0`eC`^Q_RLYZlwB^Wp zZ`0nAj6JKvu}jwjT2In<^NhwI`b&gPtE8pWLUqD97-XA{>9eY2Ufvs_$0xq(sB3hh zrbHlY`>sYkK8l|Smjvz{REa;Vh}BuAI| Date: Sun, 19 Jun 2022 12:39:24 +0200 Subject: [PATCH 2/5] rebase --- .../like-waiting.png | Bin 29539 -> 0 bytes src/tokens/solana.tokenlist.json | 1 + 2 files changed, 1 insertion(+) delete mode 100644 assets/mainnet/CUR9kjRj86tD8Yb19hzoL182bz5U2CuFbkBNBbDVgQVk/like-waiting.png diff --git a/assets/mainnet/CUR9kjRj86tD8Yb19hzoL182bz5U2CuFbkBNBbDVgQVk/like-waiting.png b/assets/mainnet/CUR9kjRj86tD8Yb19hzoL182bz5U2CuFbkBNBbDVgQVk/like-waiting.png deleted file mode 100644 index 93779734e458eca0a6d03768029e421265ad8645..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 29539 zcmeI5-%C?*7{IY6ih%7XIL9n&mcKs9|jFM!H!8lXep*Xw5eCq!<1H(M1%`#cl?>*mlnQec$JO zp3fPwwjR$>?N$*&a+;f%HbUgW_Dh+$_0Gex0v{p8q?xI+_m6#kUzc-`(J=4ILZ3__ zdVxB}XSdh|VsyHq?uF_*h4RshmZf;IMq1ac52Vsz$InvU9A1o9Y$R4*c05SF_Fst4 zIsE>~6l)i~Ju{mYLpWMYydrlcz}_-f8U)q+275bNY!}lLfk#%UOjY%*yGWn=R@bg* zq`PHvytiF9c*5t%^Av~@BU9X+k?*5YE|HrKR0u!PZZTwytPN9d>NmpW0@vH;WNIBJ zi}d*(`lFvebyj0Y_-tI)w4|jA`)Ac7%GKeB{5~}s_^|dgl3hQ^8dX)o0dF}@WfnMde1ne9#PFx?q_RLhmG$%g&uhUgd>myLF@&ACZx9z zRYNWhAw(oD5idoS7Qtbpr2qX$_<8q!{f-v^S$G8hK{)`w0`eC`^Q_RLYZlwB^Wp zZ`0nAj6JKvu}jwjT2In<^NhwI`b&gPtE8pWLUqD97-XA{>9eY2Ufvs_$0xq(sB3hh zrbHlY`>sYkK8l|Smjvz{REa;Vh}BuAI| Date: Sun, 19 Jun 2022 16:20:01 +0200 Subject: [PATCH 3/5] add daft --- src/tokens/solana.tokenlist.json | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/tokens/solana.tokenlist.json b/src/tokens/solana.tokenlist.json index 3784cfd23971..025bc3123938 100644 --- a/src/tokens/solana.tokenlist.json +++ b/src/tokens/solana.tokenlist.json @@ -183466,8 +183466,21 @@ "tags": [ "social-token" ] + }, + + { + "chainId": 101, + "address": "CUR9kjRj86tD8Yb19hzoL182bz5U2CuFbkBNBbDVgQVk", + "symbol": "$DAFT", + "name": "DAFT Token", + "decimals": 0, + "logoURI": "https://raw.githubusercontent.com/likebad/token-list/main/assets/mainnet/CUR9kjRj86tD8Yb19hzoL182bz5U2CuFbkBNBbDVgQVk/logo.png", + "tags": [ + "utility-token" + ] } + ], "version": { From 767974541a2ceb87035c448643e522c6aada1f33 Mon Sep 17 00:00:00 2001 From: likebad Date: Sun, 19 Jun 2022 16:25:51 +0200 Subject: [PATCH 4/5] remove junk --- src/tokens/solana.tokenlist.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/tokens/solana.tokenlist.json b/src/tokens/solana.tokenlist.json index 025bc3123938..e0e1211bd1fc 100644 --- a/src/tokens/solana.tokenlist.json +++ b/src/tokens/solana.tokenlist.json @@ -183405,8 +183405,6 @@ "utility-token" ] }, -<<<<<<< HEAD -<<<<<<< HEAD { "chainId": 103, "address": "B78NMBvVjrn2USLt4uy723qmN3fMhQ6cD5AuJtxqTtGL", From 0076deda66660d8fafd6ed6ac49a3b2988cba170 Mon Sep 17 00:00:00 2001 From: likebad Date: Sun, 19 Jun 2022 16:29:14 +0200 Subject: [PATCH 5/5] remove duplicate --- src/tokens/solana.tokenlist.json | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/tokens/solana.tokenlist.json b/src/tokens/solana.tokenlist.json index e0e1211bd1fc..9f0fbab0e232 100644 --- a/src/tokens/solana.tokenlist.json +++ b/src/tokens/solana.tokenlist.json @@ -183431,17 +183431,7 @@ "website": "https://kaizokumechanics.io/" } }, - { - "chainId": 101, - "address": "CUR9kjRj86tD8Yb19hzoL182bz5U2CuFbkBNBbDVgQVk", - "symbol": "$DAFT", - "name": "DAFT Token", - "decimals": 0, - "logoURI": "https://raw.githubusercontent.com/likebad/token-list/main/assets/mainnet/CUR9kjRj86tD8Yb19hzoL182bz5U2CuFbkBNBbDVgQVk/logo.png", - "tags": [ - "utility-token" - ] - }, + { "chainId": 101, "address": "FLWT2P3hdpPACswnkSeV6wivjGJrdP7XBzGhzTQD4Q4h",