X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=NEWS;h=537d19beb5404aa8058c32c09ce14183946c9921;hb=41a1c0507a757c692453bad159eb17f6f00db242;hp=6ee0a2466cda9afd7815b137ac7af7fdba557a22;hpb=06f5d6b7432d639ff3721d56f2c89b7d5b6cb963;p=ppastats.git

diff --git a/NEWS b/NEWS
index 6ee0a24..537d19b 100644
--- 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
 ------