Skip to content

Fix diverged git history of master branch on server and ARMAR-6

Tilman Daab requested to merge local-armar6-changes into master

The master branch on the server and on ARMAR-6 diverged, which seems only to be a matter of (merge) commits, but not content changes. Please merge this branch into master, to have a clean state again.

Merge request reports