# Conflicts: # .gitignore # .travis/linux_before_install.sh # docs/release_notes.rst # test_requirements.txt