README.rst: Remove conflict markers

mkoeppe · mkoeppe · commit c937ed056145 · 2024-03-19T19:03:22.000-07:00
diff --git a/README.rst b/README.rst
@@ -44,10 +44,6 @@ The available objects and functions from the `ppl` Python module are:
 Installation
 ------------
 
-<<<<<<< HEAD
-=======
-
->>>>>>> upstream/master
 The project is available at `Python Package Index <https://pypi.org/project/pplpy/>`_ and
 can be installed with pip::
 
