From 11fddd6f0cf0c0090a28a675aa2bba9ae640fe76 Mon Sep 17 00:00:00 2001 From: t00ts Date: Thu, 2 Dec 2021 12:54:58 +0100 Subject: [PATCH] Fix CHANGELOG ref --- CHANGELOG.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0649c71..8035367 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,11 +10,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - Add `auto_propagate` flag to Peer [#57] -<<<<<<< HEAD - Add optional `height` parameter to `broadcast` method [#57] -======= - Add `send` method to public API [#58] ->>>>>>> Add send method to Peer ### Changed @@ -35,6 +32,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Examples in `example` dir [#57]: https://github.com/dusk-network/kadcast/issues/57 -[#58]: https://github.com/dusk-network/kadcast/issues/57 +[#58]: https://github.com/dusk-network/kadcast/issues/58 [#60]: https://github.com/dusk-network/kadcast/issues/60 [#63]: https://github.com/dusk-network/kadcast/issues/63