Add assets for 'TRO-94c925'

[dan0shinydream]

[paulmultiversx]

Hi, @NeltudOne

You have conflicting files that needs to be resolved: TRO-94c925/info.json

Feel free to use the Assets dApp to fix the issue: https://assets.multiversx.com/

[dan0shinydream]

I used https://assets.multiversx.com/

Le jeu. 14 mars 2024, 11:17, Paul | MultiversX @.***> a écrit :

Hi, @NeltudOne https://github.com/NeltudOne

You have conflicting files that needs to be resolved: TRO-94c925/info.json

Feel free to use the Assets dApp to fix the issue: https://assets.multiversx.com/

— Reply to this email directly, view it on GitHub https://github.com/multiversx/mx-assets/pull/2197#issuecomment-1997101813, or unsubscribe https://github.com/notifications/unsubscribe-auth/AYLNMCJTFURP7IIM6XBZOGDYYF2L5AVCNFSM6AAAAABEVIUJ76VHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMYTSOJXGEYDCOBRGM . You are receiving this because you were mentioned.Message ID: @.***>

[paulmultiversx]

Hi, @NeltudOne.

You need to manually resolve the conflicts. In case you don't know how to do that, then just erase the fork from Github and re-start the process clean.

Thanks.