From 0de3520efbaf1b4a8bd6ffbb2ab8df2e52e0cf5c Mon Sep 17 00:00:00 2001 From: Jason Carver Date: Thu, 18 Aug 2022 12:46:44 -0700 Subject: [PATCH] Fix unmerged section of readme, from template --- README.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/README.md b/README.md index afc0e18..ddc62c2 100644 --- a/README.md +++ b/README.md @@ -7,13 +7,9 @@ [![Docs build](https://readthedocs.org/projects/ssz/badge/?version=latest)](http://ssz.readthedocs.io/en/latest/?badge=latest) -<<<<<<< HEAD Python implementation of the Simple Serialization encoding and decoding -Read more in the [documentation on ReadTheDocs](https://ssz.readthedocs.io/). [View the change log](https://ssz.readthedocs.io/en/latest/releases.html). -======= Read more in the [documentation on ReadTheDocs](https://ssz.readthedocs.io/). [View the change log](https://ssz.readthedocs.io/en/latest/release_notes.html). ->>>>>>> template ## Quickstart