# Conflicts:
#	deploy.sh
#	manifests/monitoringservice.yaml
#	manifests/webuiservice.yaml
#	src/automation/src/main/java/eu/teraflow/automation/ContextSubscriber.java
#	src/automation/target/kubernetes/kubernetes.yml
#	src/common/DeviceTypes.py
#	src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/Constants.py
#	src/device/service/drivers/__init__.py
#	src/slice/service/SliceServiceServicerImpl.py
#	src/tests/ofc22/run_test_01_bootstrap.sh
#	src/webui/service/static/topology_icons/Acknowledgements.txt
#	tutorial/2-2-ofc22.md