# Conflicts: # include/etl/delegate.h # include/etl/version.h # support/Release notes.txt # test/test_delegate.cpp