solved conflict updated figure in masterthesis to the correct one

This commit is contained in:
a.ott
2020-12-07 14:22:44 +01:00
8 changed files with 106 additions and 125 deletions