resolve conflict

This commit is contained in:
ca333
2018-10-16 11:14:52 +02:00

View File

@@ -8,6 +8,7 @@
This is the official Komodo sourcecode repository based on https://github.com/jl777/komodo.
## Development Resources
- Komodo Website: [https://komodoplatform.com](https://komodoplatform.com/)
- Komodo Blockexplorer: [https://kmdexplorer.io](https://kmdexplorer.io/)
- Komodo Discord: [https://komodoplatform.com/discord](https://komodoplatform.com/discord)