# Conflicts:
#	source/RobotAPI/libraries/armem/CMakeLists.txt
#	source/RobotAPI/libraries/armem/core/detail/EntityContainer.h
#	source/RobotAPI/libraries/armem/server/MemoryToIceAdapter.h