1 files changed, 7 insertions, 0 deletions

diff --git a/NEWS b/NEWS
index 5d0fbce..0497d99 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,13 @@
+16
+
+<<<<<<< HEAD/NEWS
+* Fix icon and roundbox changes in sugar (morgs)
+
+=======
 * Add greek translation (simosx)
 * Add arabic translation (khaled)
 
+>>>>>>> 2595c9996dfb42180c68bd75a27118f1693e561c/NEWS
 15
 
 * Rename buddy icon (morgs)