Inicial
.gitignore
merge resolution