funcional

2 files changed, 3 insertions, 4 deletions

diff --git a/Dictado.py b/Dictado.py
index d2c0a49..74a97e6 100644
--- a/Dictado.py
+++ b/Dictado.py
@@ -192,10 +192,9 @@ class Dictado:
 				#self.word = self.words[(self.num_clic) - 1]
 				subprocess.call("espeak -s 100 -v es-sc --stdout %s | aplay" % w, shell=True)
 				#subprocess.call("espeak -s 100 -v es-sc --stdout %s | aplay" % self.word, shell=True)
-<<<<<<< Updated upstream
+
 				self._autocall_cb(100, self.palabra)
-=======
->>>>>>> Stashed changes
+
 				self.texto.set_text("")
 
 	def _dictar_cb(self, widget, data=None):
diff --git a/nivel.txt b/nivel.txt
index d8263ee..56a6051 100644
--- a/nivel.txt
+++ b/nivel.txt
@@ -1 +1 @@
-2
\ No newline at end of file
+1
\ No newline at end of file