From 3d90da039eab4292263c95be54d018161be996ca Mon Sep 17 00:00:00 2001
From: Walter D. Vargas <pynash@gmail.com>
Date: Fri, 27 Aug 2010 16:31:55 +0000
Subject: modificado nivel

---
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
--
cgit v0.9.1