diff options
-rw-r--r-- | NEWS | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -1,5 +1 @@ -<<<<<<< HEAD:NEWS First version of the collaborated memosono. (erikos) -======= -The initial collaborated memosono (erikos). ->>>>>>> tubes:NEWS |
index : ~klevingluo/memorize/klevingluos-memorize | ||
Unnamed repository; edit this file to name it for gitweb. |
summaryrefslogtreecommitdiffstats |
-rw-r--r-- | NEWS | 4 |
@@ -1,5 +1 @@ -<<<<<<< HEAD:NEWS First version of the collaborated memosono. (erikos) -======= -The initial collaborated memosono (erikos). ->>>>>>> tubes:NEWS |