# Conflicts:
#	CHANGELOG.md
#	CMakeLists.txt
#	PROTOCOL-VERSIONS.md
#	authorizer/src/asapo_authorizer/go.mod
#	authorizer/src/asapo_authorizer/go.sum
#	authorizer/src/asapo_authorizer/server/authorize.go
#	authorizer/src/asapo_authorizer/server/authorize_test.go
#	authorizer/src/asapo_authorizer/server/folder_token.go
#	authorizer/src/asapo_authorizer/server/folder_token_test.go
#	authorizer/src/asapo_authorizer/server/server.go
#	broker/src/asapo_broker/go.sum
#	broker/src/asapo_broker/server/process_request.go
#	consumer/api/c/include/asapo/consumer_c.h
#	consumer/api/cpp/src/consumer_c_glue.cpp
#	consumer/api/cpp/src/rds_response_error.h
#	consumer/api/cpp/unittests/test_consumer_impl.cpp
#	deploy/asapo_services/asap3.tfvars
#	deploy/asapo_services/run.sh
#	deploy/asapo_services/scripts/templates.tf
#	deploy/build_env/centos/build.sh
#	deploy/build_env/debians/build_images.sh
#	deploy/build_env/manylinux2010/build.sh
#	deploy/build_env/manylinux2010/build_image.sh
#	discovery/src/asapo_discovery/go.sum
#	discovery/src/asapo_discovery/protocols/hard_coded_consumer.go
#	discovery/src/asapo_discovery/protocols/hard_coded_producer.go
#	docs/site/examples/c/consume.c
#	docs/site/examples/frozen_versions/21.06.0/getting_started/python/produce.py
#	docs/site/examples/getting_started/python/produce.py
#	examples/producer/dummy-data-producer/dummy_data_producer.cpp
#	file_transfer/src/asapo_file_transfer/server/transfer.go
#	producer/api/cpp/src/receiver_discovery_service.cpp
#	receiver/CMakeLists.txt
#	receiver/src/connection.cpp
#	receiver/src/main.cpp
#	receiver/src/receiver_data_server/net_server/rds_tcp_server.cpp
#	receiver/src/receiver_logger.cpp
#	receiver/src/receiver_logger.h
#	receiver/src/request.cpp
#	receiver/src/request.h
#	receiver/src/request_handler/request_factory.h
#	receiver/src/request_handler/request_handler_authorize.cpp
#	receiver/src/request_handler/request_handler_authorize.h
#	receiver/src/request_handler/request_handler_receive_data.cpp
#	receiver/src/request_handler/requests_dispatcher.cpp
#	receiver/unittests/receiver_data_server/net_server/test_rds_fabric_server.cpp
#	receiver/unittests/receiver_data_server/net_server/test_rds_tcp_server.cpp
#	receiver/unittests/receiver_data_server/request_handler/test_request_handler.cpp
#	receiver/unittests/receiver_mocking.h
#	receiver/unittests/request_handler/file_processors/test_receive_file_processor.cpp
#	receiver/unittests/request_handler/file_processors/test_write_file_processor.cpp
#	receiver/unittests/request_handler/test_request_factory.cpp
#	receiver/unittests/request_handler/test_request_handler_authorizer.cpp
#	receiver/unittests/request_handler/test_request_handler_db_get_meta.cpp
#	receiver/unittests/request_handler/test_request_handler_db_last_stream.cpp
#	receiver/unittests/request_handler/test_request_handler_db_meta_writer.cpp
#	receiver/unittests/request_handler/test_request_handler_db_stream_info.cpp
#	receiver/unittests/request_handler/test_request_handler_delete_stream.cpp
#	receiver/unittests/request_handler/test_request_handler_file_process.cpp
#	receiver/unittests/request_handler/test_request_handler_receive_data.cpp
#	receiver/unittests/request_handler/test_request_handler_receive_metadata.cpp
#	receiver/unittests/request_handler/test_requests_dispatcher.cpp
#	receiver/unittests/statistics/test_receiver_statistics.cpp
#	receiver/unittests/test_connection.cpp
#	receiver/unittests/test_request.cpp
#	tests/automatic/full_chain/simple_chain/check_linux.sh
#	tests/automatic/full_chain/simple_chain_dataset/check_linux.sh
#	tests/automatic/full_chain/simple_chain_filegen_readdata_cache/check_linux.sh
#	tests/automatic/full_chain/simple_chain_filegen_readdata_file/check_linux.sh
#	tests/automatic/full_chain/simple_chain_metadata/check_linux.sh
#	tests/automatic/full_chain/simple_chain_raw/check_linux.sh
#	tests/automatic/full_chain/simple_chain_usermeta_python/check_linux.sh
#	tests/automatic/full_chain/two_beamlines/check_linux.sh
#	tests/manual/broker_debug_local/broker.json
#	tests/manual/broker_debug_local/discovery.json
#	tests/manual/broker_debug_local/discovery.json.tpl
#	tests/manual/broker_debug_local/receiver.json
#	tests/manual/broker_debug_local/receiver.json.tpl
#	tests/manual/maxwell/asapo_test/produce.py
#	tests/manual/performance_broker/settings.json
#	tests/manual/performance_broker_receiver/getlast_broker.cpp
#	tests/manual/performance_full_chain_simple/broker.json
#	tests/manual/performance_full_chain_simple/receiver.json
#	tests/manual/performance_producer_receiver/receiver.json
#	tests/manual/producer_cpp/producer.cpp
#	tests/manual/python_tests/producer/discovery.json.tpl
#	tests/manual/python_tests/producer/receiver.json.tpl
#	tests/manual/python_tests/producer/short_test.py
#	tests/manual/python_tests/producer/test.py
#	tests/manual/python_tests/producer_wait_bug_mongo/receiver.json.tpl
#	tests/manual/python_tests/producer_wait_bug_mongo/test.py
#	tests/manual/python_tests/producer_wait_threads/producer_api.py
#	tests/manual/python_tests/producer_wait_threads/test.py
#	tests/manual/receiver_debug_local/broker.json.tpl
#	tests/manual/receiver_debug_local/discovery.json
#	tests/manual/receiver_debug_local/discovery.json.tpl
#	tests/manual/receiver_debug_local/receiver.json