Remove svn conflict marker that was left behind.

zopefoundation · May 31, 2008 · 36ea778 · 36ea778
1 parent c0475d5
commit 36ea778
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -106,7 +106,6 @@ Bug fixes
 * Fix https://bugs.launchpad.net/grok/+bug/162437: grok.Form and its
   subclasses did not implement IBrowserView.
 
-<<<<<<< .working
 * Fix https://bugs.launchpad.net/grok/+bug/185414: grok introspector
   was broken for zipped eggs.