another method
var
commit
Commit
1 modifica
Modifica 2
3 modifica
modifica 4
modifica 5
Modifica 7
Merge branch 'master' of https://github.com/flaviocapacciocnh/new.git

Conflicts:
	bin/flavio/Jonathan.class
no bin folders
Merge branch 'skill1'

Conflicts:
	src/flavio/Jonathan.java
mod0 on master
mod_1 on master
Merge remote-tracking branch 'origin/master' into skill1

Conflicts:
	bin/flavio/Jonathan.class
	src/flavio/Jonathan.java