[Python-checkins] cpython: - fix merge conflict

[matthias.klose]

http://hg.python.org/cpython/rev/4e4eb69a1724
changeset:   90383:4e4eb69a1724
user:        doko at ubuntu.com
date:        Thu Apr 17 18:46:53 2014 +0200
summary:
  - fix merge conflict

files:
  Misc/NEWS |  8 +++-----
  1 files changed, 3 insertions(+), 5 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -244,14 +244,12 @@
 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.

-- 
Repository URL: http://hg.python.org/cpython