Synchro pour backup
Merge branch 'master' of github.com:cescoff/untitled2
Reparer le repo local
Reparer le repo local
IDEA
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	desktop-application/desktop-application.iml
	untitled/untitled.iml