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 : ~RafaelOrtiz/memorize/rafaelortizs-memorize-customizations | ||
aab49a8c4a0583d43d6b61be9b7df88d0d |
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 |