diff options
-rw-r--r-- | NEWS | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -1 +1,5 @@ -The initial collaborated memosono (erikos).
\ No newline at end of file +<<<<<<< HEAD:NEWS +First version of the collaborated memosono. (erikos) +======= +The initial collaborated memosono (erikos). +>>>>>>> tubes:NEWS |