From d267599aaa92372d0d9a868f1662f3aec60d722d Mon Sep 17 00:00:00 2001
From: Simon Schampijer <simon@schampijer.de>
Date: Wed, 11 Jul 2007 17:07:15 +0000
Subject: Merge branch 'tubes'

Conflicts:

	NEWS
---
(limited to 'NEWS')

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