remove merge artifact

6b7f42ab · Jim Fulton · a749cff4 · 6b7f42ab
Commit 6b7f42ab authored Jan 08, 2017 by Jim Fulton
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

CHANGES.rst CHANGES.rst +0 -1

No files found.
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -20,7 +20,6 @@ Changelog

 - Temporarily require non-quite-current versions of ZODB and
  transaction until we can sort out some recent breakage.
->>>>>>> origin/master

 5.0.2 (2016-11-02)
 ------------------