test.txt

modif
plop
dfghj
test sync
blabla
Merge branch 'master' of https://github.com/xakp/EE250.stm8

Conflicts:
	tedgfst.txt