From: doko@ubuntu.com <doko@ubuntu.com>
Date: Thu, 17 Apr 2014 16:46:53 +0000 (+0200)
Subject: - fix merge conflict
X-Git-Tag: v3.5.0a1~1834
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=72f61de768dc17ad528e1b3c01a87998eff22cac;p=thirdparty%2FPython%2Fcpython.git

- fix merge conflict
---

diff --git a/Misc/NEWS b/Misc/NEWS
index b26db8cfcc0a..ab5c2b78c3ba 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -244,14 +244,12 @@ IDLE
 Build
 -----
 
-<<<<<<< local
-- Issue #17861: Tools/scripts/generate_opcode_h.py automatically regenerates
-  Include/opcode.h from Lib/opcode.py if the later gets any change.
-=======
 - Issue #15234: For BerkelyDB and Sqlite, only add the found library and
   include directories if they aren't already being searched. This avoids
   an explicit runtime library dependency.
->>>>>>> other
+
+- Issue #17861: Tools/scripts/generate_opcode_h.py automatically regenerates
+  Include/opcode.h from Lib/opcode.py if the later gets any change.
 
 - Issue #20644: OS X installer build support for documentation build changes
   in 3.4.1: assume externally supplied sphinx-build is available in /usr/bin.