Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

contracts.json containing conflict markers #33

Open
OmarTawfik opened this issue Apr 11, 2024 · 0 comments
Open

contracts.json containing conflict markers #33

OmarTawfik opened this issue Apr 11, 2024 · 0 comments

Comments

@OmarTawfik
Copy link

Example: https://github.com/tintinweb/smart-contract-sanctuary-ethereum/blob/015d0105102504dc8733a18c3543f87f1829a5e8/contracts/goerli/contracts.json

{"address": "0x5Beb560fF733930ecc9981cF42dA71b10a386f98", "name": "SimpleWallet", "compiler": "0.8.7", "balance": "0 Ether", "txcount": 0, "settings": "", "date": "1/25/2022"}
<<<<<<< HEAD
{"address": "0x90f3E1105E63C877bF9587DE5388C23Cdb702c6B", "name": "EntryPoint", "compiler": "0.8.7", "balance": "0.00896224999273575 Ether", "txcount": 0, "settings": "", "date": "1/25/2022"}
=======
{"address": "0x90f3E1105E63C877bF9587DE5388C23Cdb702c6B", "name": "EntryPoint", "compiler": "0.8.7", "balance": "0.018639257982839423 Ether", "txcount": 0, "settings": "", "date": "1/25/2022"}
>>>>>>> 961d3ebb069ebce88fd2c3d88aab9a5a3ddee53b
{"address": "0x9ebC47b397D50591C9e2A0b4Ee6a1343aBB92289", "name": "HelloWorld", "compiler": "0.8.0", "balance": "-", "txcount": 0, "settings": "", "date": "1/25/2022"}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant