# Conflicts: # app/src/main/java/com/example/ellegadodepintia/repositorios/RepositorioObjetos.kt
Taberna See merge request !58
