# Conflicts: # library.properties # src/atomic/atomic_arm.h # src/atomic/atomic_gcc.h # test/vs2017/etl.vcxproj # test/vs2017/etl.vcxproj.filters