fix NEWS

diff --git a/NEWS b/NEWS
index 62fac0740d9578cb437f139f352e8bc259290ff2..46f6cb23bb8e3181838916b1be7ee2c8c2f1ab69 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,16 +1,8 @@
 procps-ng-NEXT
-<<<<<<< HEAD
-=======
-  * library
-    Re-add elogind support                                 merge #151
-  * ps: threads again display when -L is used with -q      issue #234
-  * ps: proper aix format string behavior was restored
-  * sysctl: print dotted keys again
-
-procps-ng-4.0.0
->>>>>>> b159c198 (sysctl: print dotted keys again)
 ---------------
   * Rename pwait to pidwait
+  * ps: proper aix format string behavior was restored
+  * sysctl: print dotted keys again
   * sysctl: Add support for systemd glob patterns          issue #191
   * top: 'F' key is now a new forest view 'focus' toggle
   * top: summary area memory lines can print two abreast
@@ -18,6 +10,7 @@ procps-ng-4.0.0
   * top: the time related fields can now be user scaled
   * top: added a 'start time' field (STARTED)
 
+
 procps-ng-3.3.17
 ---------------
   * library: Incremented to 8:3:0