X-Git-Url: https://git.wpitchoune.net/gitweb/?p=ppastats.git;a=blobdiff_plain;f=NEWS;h=7f3e78b7f2505faafebf526d9c595156ab0b7908;hp=6ee0a2466cda9afd7815b137ac7af7fdba557a22;hb=56acf651173b8cb7a3bcec087963732ab9441bf4;hpb=f4cb4ed98d2d2f3b492d55d4f3ee481de5eeed36

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