# Conflicts: # include/etl/type_traits.h # include/etl/type_traits_generator.h # test/test_type_traits.cpp