1 files changed, 0 insertions, 4 deletions

diff --git a/NEWS b/NEWS
index 0497d99..b4ab8cb 100644
--- a/NEWS
+++ b/NEWS
@@ -1,13 +1,9 @@
 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)