Corrección del merge

pdepjm · Oct 29, 2024 · fa3759b · fa3759b
1 parent d3be0a7
commit fa3759b
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/enemigos.wlk b/enemigos.wlk
@@ -1,18 +1,10 @@
-<<<<<<< HEAD
-import wollok.game.*
-=======
 import menus.*
 
 
 class Enemigo1{
-    var property position = game.at(4,16)
     var lado = 0
     var property vida
-    method image() = "cell1.png"
->>>>>>> 31aae21524a78eed8c63ad098b624b259371b8a5
 
-
-class Enemigo1{
     var property position = game.at(7,16)
     //var lado = 0
     method image() = "piopio.png"