diff options
author | Walter D. Vargas <pynash@gmail.com> | 2010-08-27 16:31:55 (GMT) |
---|---|---|
committer | Walter D. Vargas <pynash@gmail.com> | 2010-08-27 16:31:55 (GMT) |
commit | 3d90da039eab4292263c95be54d018161be996ca (patch) | |
tree | 036772d1eb27baa7aa59a334fd72e81889c49533 | |
parent | 0cbc7f056d74784f45e5b0cb86b2868f17125204 (diff) |
modificado nivel
-rw-r--r-- | nivel.txt | 6 |
1 files changed, 1 insertions, 5 deletions
@@ -1,5 +1 @@ -<<<<<<< Updated upstream -3 -======= -2 ->>>>>>> Stashed changes +1 |