# Conflicts:
#	source/tensor/XTensor.cpp
#	source/tensor/core/getandset/OnehotAndIndex.cpp
#	source/tensor/core/getandset/OnehotAndIndex.cu