Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWalter 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)
commit3d90da039eab4292263c95be54d018161be996ca (patch)
tree036772d1eb27baa7aa59a334fd72e81889c49533
parent0cbc7f056d74784f45e5b0cb86b2868f17125204 (diff)
modificado nivel
-rw-r--r--nivel.txt6
1 files changed, 1 insertions, 5 deletions
diff --git a/nivel.txt b/nivel.txt
index f131ba1..d00491f 100644
--- a/nivel.txt
+++ b/nivel.txt
@@ -1,5 +1 @@
-<<<<<<< Updated upstream
-3
-=======
-2
->>>>>>> Stashed changes
+1