From 1c2728aad09cf28fd194f20c01138fc53e0f4b68 Mon Sep 17 00:00:00 2001
From: Simon Schampijer <simon@schampijer.de>
Date: Wed, 11 Jul 2007 17:09:04 +0000
Subject: Resolved conflict.

---
diff --git a/NEWS b/NEWS
index 5f009e9..f9acee0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1 @@
-<<<<<<< HEAD:NEWS
 First version of the collaborated memosono. (erikos)
-=======
-The initial collaborated memosono (erikos).
->>>>>>> tubes:NEWS
--
cgit v0.9.1