# Conflicts:
#	CHANGELOG.md
#	poetry.lock
#	poetry/__version__.py
#	poetry/installation/installer.py
#	pyproject.toml
#	tests/console/conftest.py
#	tests/installation/test_installer.py
#	tests/masonry/builders/test_builder.py
#	tests/masonry/builders/test_wheel.py