From 7e028739720ddc675d8037622b8f086d2d131b86 Mon Sep 17 00:00:00 2001
From: christianale12 <leonc5574@gmail.com>
Date: Tue, 1 Oct 2024 20:21:36 -0300
Subject: [PATCH] merge

---
 dinoGame.wlk | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/dinoGame.wlk b/dinoGame.wlk
index be42bad..5d0eba4 100644
--- a/dinoGame.wlk
+++ b/dinoGame.wlk
@@ -113,10 +113,7 @@ object dino {
 	method algo(){
 
 	}
-<<<<<<< HEAD
 	
-=======
->>>>>>> d9c223bae2a0d4b52aabd3b4d7584d9b6f564b99
 	
 	method subir(){
 		position = position.up(1)