tabs replaced with spaces
Conflicts:
	composer.json