Fix bad merge for NEWs file

Change-Id: I210360086212685b609cc6eb68da957ce0f2455d
Signed-off-by: Michael Demeter <michael.demeter@intel.com>

diff --git a/NEWS b/NEWS
index aa67348..41ead74 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,74 +1,5 @@
 GNU coreutils NEWS                                    -*- outline -*-
 
-<<<<<<< HEAD
-=======
-* Noteworthy changes in release ?.? (????-??-??) [?]
-
-** Bug fixes
-
-  install now removes the target file if the strip program failed for any
-  reason.  Before, that file was left behind, sometimes even with wrong
-  permissions.
-  [This bug was present in "the beginning".]
-
-  ln --relative now updates existing symlinks correctly.  Previously it based
-  the relative link on the dereferenced path of an existing link.
-  [This bug was introduced when --relative was added in coreutils-8.16.]
-
-  mkdir, mkfifo, and mknod now work better when creating a file in a directory
-  with a default ACL whose umask disagrees with the process's umask, on a
-  system such as GNU/Linux where directory ACL umasks override process umasks.
-  [bug introduced in coreutils-6.0]
-
-  od -wN with N larger than 64K on a system with 32-bit size_t would
-  print approximately 2*N bytes of extraneous padding.
-  [Bug introduced in coreutils-7.0]
-
-  tail --retry -f now waits for the files specified to appear.  Before, tail
-  would immediately exit when such a file is inaccessible during the initial
-  open.
-  [This bug was introduced when inotify support was added in coreutils-7.5]
-
-** New features
-
-  id and ls with -Z report the SMACK security context where available.
-  mkdir, mkfifo and mknod with -Z set the SMACK context where available.
-
-  join accepts a new option: --zero-terminated (-z). As with the sort,uniq
-  option of the same name, this makes join consume and produce NUL-terminated
-  lines rather than newline-terminated lines.
-
-  uniq accepts a new option: --group to print all items, while separating
-  unique groups with empty lines.
-
-  csplit accepts a new option: --suppressed-matched, to elide the lines
-  used to identify the split points.
-
-** Changes in behavior
-
-  stdbuf now requires at least one buffering mode option to be specified,
-  as per the documented interface.
-
-** Improvements
-
-  stat and tail work better with EFIVARFS, EXOFS, F2FS, SNFS and UBIFS.
-  stat -f --format=%T now reports the file system type, and tail -f now uses
-  inotify for files on those file systems, rather than the default (for unknown
-  file system types) of issuing a warning and reverting to polling.
-
-  shuf outputs subsets of large inputs much more efficiently.
-  Reservoir sampling is used to limit memory usage based on the number of
-  outputs, rather than the number of inputs.
-
-  split --line-bytes=SIZE, now only allocates memory as needed rather
-  than allocating SIZE bytes at program start.
-
-** Build-related
-
-  factor now builds on aarch64 based systems [bug introduced in coreutils-8.20]
-
-
->>>>>>> 7d5976f... mkdir,mkfifo,mknod: with -Z, create SMACK security context
 * Noteworthy changes in release 8.21 (2013-02-14) [stable]
 
 ** New programs