# Conflicts:
#	CMakeLists.txt
#	src/headset/remote_headset.cpp
#	src/headset/remote_headset.hpp
#	src/stream/transport.hpp
#	src/utility/command_parser.cpp
#	src/utility/command_parser.hpp