Commit 9acf2cae authored by Christina Maria Mayr's avatar Christina Maria Mayr
Browse files

Merge branch 'handle_multiple_messages' into 'master'

[ControlModel] Handle conflicting and recurring information

See merge request !160
parents 05e16522 0e1dc46e
Pipeline #578356 passed with stages
in 130 minutes and 26 seconds