Awesome-Mirrors/awesome-ipfs
1
0
Fork 0
mirror of https://github.com/ipfs/awesome-ipfs.git synced 2025-04-03 19:45:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

merge conflict

Browse Source
This commit is contained in:
gjeanmart 2019-08-15 09:55:37 +01:00
parent 641029839c
commit 09cd195750
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/tools.yaml
View File

@ -103,16 +103,12 @@ content:
website: https://github.com/arsyun
source: https://github.com/arsyun/ipfs-common
description: >
<<<<<<< HEAD
some common tools, 1.CID to human readable cid, 2.cid and block name convert, 3. read the leveldb tools.
=======
Some common tools, 1.CID to human readable cid, 2.cid and block name convert, 3. read the leveldb tools.
- title: ipfs-publish
picture: /images/ipfs-publish.png
website: https://ipfs-publish.uhlir.dev
source: https://github.com/AuHau/ipfs-publish
description: Continuous Delivery tool for delivery of static websites from Git providers to IPFS.
>>>>>>> upstream/master
- title: mahuta
website: https://github.com/ConsenSys/Mahuta
source: https://github.com/ConsenSys/Mahuta