[Python-checkins] [python/cpython] ce92be: remove merge=union attribute for Misc/NEWS (GH-460...

Tue Apr 4 05:49:16 EDT 2017

  Branch: refs/heads/3.6
  Home:   https://github.com/python/cpython
  Commit: ce92be1825c5ca1d3e6bff24598f3aa54c000b22
      https://github.com/python/cpython/commit/ce92be1825c5ca1d3e6bff24598f3aa54c000b22
  Author: Mariatta <Mariatta at users.noreply.github.com>
  Date:   2017-04-04 (Tue, 04 Apr 2017)

  Changed paths:
    M .gitattributes

  Log Message:
  -----------
  remove merge=union attribute for Misc/NEWS (GH-460) (GH-988)


(cherry picked from commit 060d2d776a29341c079cce37220324f9775140ba)