Jakob Meier 9fc1e57943 fixed conflicts

2022-03-14 14:35:07 +01:00

..

pollingSequenceFactory.cpp

fixed conflicts

2022-03-14 14:35:07 +01:00

pollingSequenceFactory.h

applied clang formatting

2022-01-18 11:41:19 +01:00