diff options
| author | Simon Schampijer <simon@schampijer.de> | 2007-07-11 17:09:04 (GMT) |
|---|---|---|
| committer | Simon Schampijer <simon@schampijer.de> | 2007-07-11 17:09:04 (GMT) |
| commit | 1c2728aad09cf28fd194f20c01138fc53e0f4b68 (patch) | |
| tree | 2710efb81669931ed3a4328e5464377a35327c77 | |
| parent | d267599aaa92372d0d9a868f1662f3aec60d722d (diff) | |
Resolved conflict.
| -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 |