Commit 43700a7571ce086db8b241e0ca0fc2745a431565
receivedSat, 30. Sep 2023, 17:40:22 (by user sx)
Sat, 30 Sep 2023 15:40:22 +0000 (17:40 +0200)
authorManfred Steiner <sx@htl-kaindorf.at>
Sat, 30 Sep 2023 15:40:19 +0000 (17:40 +0200)
committerManfred Steiner <sx@htl-kaindorf.at>
Sat, 30 Sep 2023 15:40:19 +0000 (17:40 +0200)
tree3c979639b0c29e9c2badd15ef30c2d5a0eca305e
parent8a82411fe2c0cd71529685398d3f26f431518974
Message:
merge conflict resolved
examples/simuc/src/main.cpp