updated

[ppastats.git] / NEWS

diff --git a/NEWS b/NEWS
index 6ee0a24..537d19b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -4,14 +4,7 @@ v1.0.0
 * new design for HTML pages.
 * 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.
+* fixed compilation with libjson-c-dev debian package.
 
 v0.0.8
 ------