remove merge goop from f86fde20e9ce

diff --git a/Misc/NEWS b/Misc/NEWS
index 7ab2c77bd911ed2edd81903253c0c7d8d6d03768..3a5e635326bb7d6165d2672edcba872467514713 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -35,71 +35,6 @@ Core and Builtins
 
 - Issue #22258: Fix the internal function set_inheritable() on Illumos.
 
-Library
--------
-
-- Issue #22396: On 32-bit AIX platform, don't expose os.posix_fadvise() nor
-  os.posix_fallocate() because their prototypes in system headers are wrong.
-
-- Issue #22517: When a io.BufferedRWPair object is deallocated, clear its
-  weakrefs.
-
-- Issue #22448: Improve canceled timer handles cleanup to prevent
-  unbound memory usage. Patch by Joshua Moore-Oliva.
-
-Build
------
-
-- Issue #16537: Check whether self.extensions is empty in setup.py. Patch by
-  Jonathan Hosmer.
-
-
-What's New in Python 3.4.2?
-===========================
-
-Release date: 2014-10-06
-
-Core and Builtins
------------------
-
-Library
--------
-
-- Issue #10510: distutils register and upload methods now use HTML standards
-  compliant CRLF line endings.
-
-- Issue #9850: Fixed macpath.join() for empty first component.  Patch by
-  Oleg Oshmyan.
-
-- Issue #22427: TemporaryDirectory no longer attempts to clean up twice when
-  used in the with statement in generator.
-
-- Issue #20912: Now directories added to ZIP file have correct Unix and MS-DOS
-  directory attributes.
-
-- Issue #21866: ZipFile.close() no longer writes ZIP64 central directory
-  records if allowZip64 is false.
-
-- Issue #22415: Fixed debugging output of the GROUPREF_EXISTS opcode in the re
-  module.  Removed trailing spaces in debugging output.
-
-- Issue #22423: Unhandled exception in thread no longer causes unhandled
-  AttributeError when sys.stderr is None.
-
-- Issue #21332: Ensure that ``bufsize=1`` in subprocess.Popen() selects
-  line buffering, rather than block buffering.  Patch by Akira Li.
-
-
-What's New in Python 3.4.2rc1?
-==============================
-
-Release date: 2014-09-22
-
-Core and Builtins
------------------
-
-- Issue #22258: Fix the the internal function set_inheritable() on Illumos.
->>>>>>> other
   This platform exposes the function ``ioctl(FIOCLEX)``, but calling it fails
   with errno is ENOTTY: "Inappropriate ioctl for device". set_inheritable()
   now falls back to the slower ``fcntl()`` (``F_GETFD`` and then ``F_SETFD``).