remove merge artifact

zopefoundation · Jan 8, 2017 · 6b7f42a · 6b7f42a
1 parent a749cff
commit 6b7f42a
Showing 1 changed file with 0 additions and 1 deletion.
diff --git 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)
 ------------------