# Conflicts:
#	est/core/process/process.py
#	est/core/process/pymca/test/test_io.py
#	est/core/process/test/test_roi.py
#	est/core/test/test_types.py
#	est/io/io.py
#	est/setup.py

# Conflicts:
#	est/core/types.py
#	requirements.txt