Remove merge marker from CHANGES

sphinx-doc · Aug 20, 2019 · 3261b87 · 3261b87
1 parent 01f8dad
commit 3261b87
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/CHANGES b/CHANGES
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 Release 3.0.0 (in development)
 ==============================