teste commit
teste commit
Merge branch 'master' of https://github.com/castelom/metodos

Conflicts:
	bin/ifce/Contador.class
	src/ifce/Contador.java
commit
Commit alteração no contdor
Merge branch 'master' of https://github.com/castelom/metodos
Commit alteração no contador 2
commit
Merge branch 'master' of https://github.com/castelom/metodos
teste commit
Merge remote-tracking branch 'origin/branch'

Conflicts:
	bin/ifce/Contador.class
	src/ifce/Contador.java
Merge remote-tracking branch 'origin/branch'
teste commit atualização main
Merge branch 'master' of https://github.com/castelom/metodos
Merge branch 'master' of https://github.com/castelom/metodos

Conflicts:
	src/ifce/main.java
Commit Atualização do contador
Merge branch 'master' of https://github.com/castelom/metodos
Commit Atualização do contador tentativa de conflito
Commit retirada de métodos
Merge branch 'master' of https://github.com/castelom/metodos