Skip to content
Snippets Groups Projects
Commit a38633aa authored by Mayr, Hannes's avatar Mayr, Hannes
Browse files

Resolve merge conflicts.

parents 1af6e3ee 376d13fc
No related branches found
No related tags found
2 merge requests!52Create v0.2.2,!51Fix documentation build
Pipeline #855294 waiting for manual action