Skip to content
Snippets Groups Projects
Commit e25d28c4 authored by diegval's avatar diegval
Browse files

Merge branch 'develop' into 'eventoDesenterrar'

# Conflicts:
#   app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/ExploradoresDePintia.kt
#   app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/GeneradorDeEventos.kt
#   app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/TipoEvento.kt
#   app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/eventoFactory/EventoFactorySelector.kt
#   app/src/main/java/com/example/ellegadodepintia/repositorios/RepositorioObjetos.kt
parents 14302585 26231d69
No related branches found
No related tags found
2 merge requests!65Feature:,!56Feature: evento desenterrar. Deberás tener la pala vaccea en tu inventario,...
Showing
with 233 additions and 91 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment