[Checkins] SVN: grok/branches/ulif-grokdocs/CHANGES.txt Get rid of garbage.

[Uli Fouquet]

Log message for revision 85918:
  Get rid of garbage.

Changed:
  U   grok/branches/ulif-grokdocs/CHANGES.txt

-=-
Modified: grok/branches/ulif-grokdocs/CHANGES.txt
===================================================================
--- grok/branches/ulif-grokdocs/CHANGES.txt	2008-04-30 16:42:00 UTC (rev 85917)
+++ grok/branches/ulif-grokdocs/CHANGES.txt	2008-04-30 17:49:25 UTC (rev 85918)
@@ -67,11 +67,7 @@
 
   See also the `upgrade notes`_ for information on how to update
   your existing projects.
-<<<<<<< .working
- 
-=======
 
->>>>>>> .merge-rechts.r85857
 .. _`upgrade notes`: http://grok.zope.org/project/upgrade-notes
 
 Bug fixes