docs: clean up old conflict remains from CHANGES.rst

akaihola · Sep 18, 2024 · 89d5d5b · 89d5d5b
1 parent 4a555ae
commit 89d5d5b
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -42,10 +42,6 @@ Added
 
 Added
 -----
-<<<<<<< HEAD
-
-=======
->>>>>>> 70fc10c (Bump to version 1.1.0)
 - Document ``pg_incremental_backup.py`` in the README file