confilt
recup confiltMerge branch 'master' of github.com:lepiaf31/ExemplesMoodleXML