From: Georg Brandl <georg@python.org>
Date: Fri, 1 Aug 2008 16:25:12 +0000 (+0000)
Subject: Fix merge conflict.
X-Git-Tag: v3.0b3~192
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ebd9af44c53dd17dd8f6f2a60697ed6ee885e1d5;p=python

Fix merge conflict.
---

diff --git a/Misc/NEWS b/Misc/NEWS
index 886af2254a..b7d4992b42 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -26,22 +26,8 @@ Library
   file name rather than a ZipInfo instance, so files are extracted with
   mode 0600 rather than 000 under Unix.
 
-<<<<<<< .working
 - Issue #2523: Fix quadratic behaviour when read()ing a binary file without
   asking for a specific length.
-=======
-Build
------
->>>>>>> .merge-right.r65368
-
-<<<<<<< .working
-=======
-- Generate the PatternGrammar pickle during "make install".
-
-
-What's New in Python 2.6 beta 2?
-================================
->>>>>>> .merge-right.r65368
 
 What's new in Python 3.0b2?
 ===========================