[Checkins] SVN: grok/branches/0.12/CHANGES.txt Remove svn conflict marker that was left behind.

Sat May 31 14:09:53 EDT 2008

Log message for revision 87074:
  Remove svn conflict marker that was left behind.

Changed:
  U   grok/branches/0.12/CHANGES.txt

-=-
Modified: grok/branches/0.12/CHANGES.txt
===================================================================

--- grok/branches/0.12/CHANGES.txt	2008-05-31 18:09:37 UTC (rev 87073)
+++ grok/branches/0.12/CHANGES.txt	2008-05-31 18:09:52 UTC (rev 87074)
@@ -106,7 +106,6 @@
 * 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.
 

