From ff0097755220de7472e31b3054813b61366f991d Mon Sep 17 00:00:00 2001
From: Simon Schampijer <simon@schampijer.de>
Date: Fri, 07 Dec 2007 15:01:28 +0000
Subject: cleaned the news

---
diff --git a/NEWS b/NEWS
index 61b1f0f..ffd2eb2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,11 +1,8 @@
 78
 
-<<<<<<< HEAD:NEWS
 77
 
-=======
 * Give to the DS the ownership of the files we hand to it #5235 (tomeu)
->>>>>>> d347f616e9d1177aae343ac9d0d04df51c2c6078:NEWS
 * Open an uri of type text/uri-list with browse #5080 (erikos)
 * Save view source to SAR/instance #5251 (erikos)
 * Move the profile in SAR/data #5221 (erikos)
--
cgit v0.9.1