gnunet-rpm

commit c7f69f29b73d22d22cbf01ef6b729be528f44763
parent d595925664685dfc7722e9d174b57225354fe35a
Author: Yosl <yosl@seattlemesh.net>
Date:   Mon, 17 Feb 2020 18:54:13 -0800

Fixed readme.md

Diffstat:
M
README.md
 | 
4
----

1 file changed, 0 insertions(+), 4 deletions(-)
diff --git a/README.md b/README.md
@@ -1,10 +1,6 @@
 # Packaging GNUnet for RPM #
 
-<<<<<<< HEAD
 Work is currently being done in the [subpkg](https://git.callpipe.com/gnunet-wip/gnunet-rpm/tree/subpkg) branch.
-=======
-Work is currently being done in the subpkg branch
->>>>>>> subpkg
 
 ## Resources ##