Jakob Meier 8d70560968 fixed conflicts

2022-03-17 19:52:37 +01:00

..

pollingSequenceFactory.cpp

fixed conflicts

2022-03-17 19:52:37 +01:00

pollingSequenceFactory.h

applied clang formatting

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