From 6500728dd283f8ff79376b83cf2611cfe1880d0a Mon Sep 17 00:00:00 2001 From: Christopher Goes Date: Thu, 12 Apr 2018 13:32:49 +0200 Subject: [PATCH] Rebase onto develop --- docs/spec/README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/spec/README.md b/docs/spec/README.md index 6492dc9392..e7507bf95e 100644 --- a/docs/spec/README.md +++ b/docs/spec/README.md @@ -5,7 +5,6 @@ the Cosmos Hub. NOTE: the specifications are not yet complete and very much a work in progress. -<<<<<<< HEAD - [Basecoin](basecoin) - Cosmos SDK related specifications and transactions for sending tokens. - [Staking](staking) - Proof of Stake related specifications including bonding