et
B:wq!

B
B
B
B
Merge remote-tracking branch 'origin/design' into design
ééé
Merge branch 'master' into testBranch

Conflicts:
	.project
dgsdsfg
dqsdqs
sqdsdsqqsds
Merge remote-tracking branch 'origin/master'