From 09cd195750589ef90396ff8818922f6e70160b31 Mon Sep 17 00:00:00 2001
From: gjeanmart <gregoire.jeanmart@gmail.com>
Date: Thu, 15 Aug 2019 09:55:37 +0100
Subject: [PATCH] merge conflict

---
 data/tools.yaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/data/tools.yaml b/data/tools.yaml
index 4b0daa7..1c9e038 100644
--- a/data/tools.yaml
+++ b/data/tools.yaml
@@ -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