merge

algo1unsam · Oct 1, 2024 · 7e02873 · 7e02873
1 parent 6e3f7fa
commit 7e02873
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/dinoGame.wlk b/dinoGame.wlk
@@ -113,10 +113,7 @@ object dino {
 	method algo(){
 
 	}
-<<<<<<< HEAD
 
-=======
->>>>>>> d9c223bae2a0d4b52aabd3b4d7584d9b6f564b99
 
 	method subir(){
 		position = position.up(1)