fixed previous merge

diff --git a/NEWS b/NEWS
index 6ee0a24..7f3e78b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -5,14 +5,6 @@ v1.0.0
 * fixed compilation issue with old json lib releases using
   boolean type and not defining json_bool.
 
-<<<<<<< .mine
-v0.0.9
-------
-
-=======
->>>>>>> .r1676
-* Fixed compilation issue related to 'boolean' type.
-
 v0.0.8
 ------