bidule
grfe
Merge branch 'truc'

Conflicts:
	test.txt