From 3e50ac2a3377dbfa9b918e6f68ada7694145a03a Mon Sep 17 00:00:00 2001
From: Morgan Collett <morgan.collett@gmail.com>
Date: Mon, 27 Aug 2007 13:43:29 +0000
Subject: Fix conflict in NEWS

---
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)
--
cgit v0.9.1