From 72f61de768dc17ad528e1b3c01a87998eff22cac Mon Sep 17 00:00:00 2001 From: "doko@ubuntu.com" Date: Thu, 17 Apr 2014 18:46:53 +0200 Subject: [PATCH] - fix merge conflict --- Misc/NEWS | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS index b26db8cfcc..ab5c2b78c3 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. -- 2.50.1