- fix merge conflict

diff --git a/Misc/NEWS b/Misc/NEWS
index b26db8cfcc0a6f6f22b634381b45d7814cf4bf7e..ab5c2b78c3ba067b2704f3ad83731ebf940107b1 100644 (file)
--- 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.