# Conflicts:
#	Dockerfile
#	app/build_json.py
#	app/let_it_snow_fsc.py
#	python/s2snow/compute_SOD_SMOD.py
#	python/s2snow/fsc_config.py
#	python/s2snow/parser.py
#	python/s2snow/snow_detector.py
#	python/s2snow/snow_product.py
#	python/s2snow/snow_synthesis.py
#	python/s2snow/synthesis_config.py
#	python/s2snow/utils.py
#	test/CMakeLists.txt
#	test/cloud_extraction_test.py
#	test/gdal_wrappers_test.py
#	test/otb_wrappers_test.py
#	test/resolution_test.py
#	test/snow_detector_test.py
#	test/snow_synthesis_test.py