1 files changed, 0 insertions, 4 deletions

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