Merge "Fix mapping issue with type C files"

author Henrik Andersson <henrik.b.andersson@est.tech>

Tue, 2 Apr 2019 12:21:37 +0000 (12:21 +0000)

committer Gerrit Code Review <gerrit@onap.org>

Tue, 2 Apr 2019 12:21:37 +0000 (12:21 +0000)
author Henrik Andersson <henrik.b.andersson@est.tech>
Tue, 2 Apr 2019 12:21:37 +0000 (12:21 +0000)
committer Gerrit Code Review <gerrit@onap.org>
Tue, 2 Apr 2019 12:21:37 +0000 (12:21 +0000)
diff --cc src/main/java/org/onap/dcaegen2/services/pmmapper/App.java
Simple merge
author	Henrik Andersson <henrik.b.andersson@est.tech>
	Tue, 2 Apr 2019 12:21:37 +0000 (12:21 +0000)
committer	Gerrit Code Review <gerrit@onap.org>
	Tue, 2 Apr 2019 12:21:37 +0000 (12:21 +0000)