tree e4f7babd67a64d3c1118addc25746ed19f6fd3e2
parent 7540aac9279c5ed8140850e19381dc06fefafec1
author demx8as6 <martin.skorupski@highstreet-technologies.com> 1584635967 +0100
committer demx8as6 <martin.skorupski@highstreet-technologies.com> 1584636001 +0100

Fix issues during merge

IssueID: OAM-62
Change-Id: I981d735eb9d150e201caa85b94cd2cf56fed5a37
Signed-off-by: demx8as6 <martin.skorupski@highstreet-technologies.com>