From 56acf651173b8cb7a3bcec087963732ab9441bf4 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Orsini Date: Thu, 13 Feb 2014 23:30:50 +0000 Subject: [PATCH] fixed previous merge --- NEWS | 8 -------- 1 file changed, 8 deletions(-) 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 ------ -- 2.7.4