[Checkins] SVN: zc.buildout/branches/help-api/CHANGES.txt leftover conflicts

[Godefroid Chapelle]

Log message for revision 101853:
  leftover conflicts

Changed:
  U   zc.buildout/branches/help-api/CHANGES.txt

-=-
Modified: zc.buildout/branches/help-api/CHANGES.txt
===================================================================
--- zc.buildout/branches/help-api/CHANGES.txt	2009-07-13 15:13:00 UTC (rev 101852)
+++ zc.buildout/branches/help-api/CHANGES.txt	2009-07-13 15:13:07 UTC (rev 101853)
@@ -101,13 +101,8 @@
 - added a test to verify against https://bugs.launchpad.net/zc.buildout/+bug/239212
   in allowhosts.txt (seletz)
 
-<<<<<<< HEAD:CHANGES.txt
-- further fixes for """AttributeError: Buildout instance has no 
-  attribute '_logger'""" by providing reasonable defaults 
-=======
 - further fixes for """AttributeError: Buildout instance has no
   attribute '_logger'""" by providing reasonable defaults
->>>>>>> origin/l-trunk:CHANGES.txt
   within the Buildout constructor (related to the new 'allow-hosts' option)
   (patch by Gottfried Ganssauge) (ajung)
 
@@ -122,11 +117,7 @@
 
 - Added the `allow-hosts` option (tarek)
 
-<<<<<<< HEAD:CHANGES.txt
-- Quote the 'executable' argument when trying to detect the python 
-=======
 - Quote the 'executable' argument when trying to detect the python
->>>>>>> origin/l-trunk:CHANGES.txt
   version using popen4. (sidnei)
 
 - Quote the 'spec' argument, as in the case of installing an egg from
@@ -137,11 +128,7 @@
 1.0.3 (2008-06-01)
 ==================
 
-<<<<<<< HEAD:CHANGES.txt
-- fix for """AttributeError: Buildout instance has no attribute '_logger'""" 
-=======
 - fix for """AttributeError: Buildout instance has no attribute '_logger'"""
->>>>>>> origin/l-trunk:CHANGES.txt
   by providing reasonable defaults within the Buildout constructor.
   (patch by Gottfried Ganssauge) (ajung)