Merge "Remove topic.properties and incorporate into overall properties"

author Ram Krishna Verma <ram.krishna.verma@est.tech>

Mon, 1 Jul 2019 08:57:52 +0000 (08:57 +0000)

committer Gerrit Code Review <gerrit@onap.org>

Mon, 1 Jul 2019 08:57:52 +0000 (08:57 +0000)
author Ram Krishna Verma <ram.krishna.verma@est.tech>
Mon, 1 Jul 2019 08:57:52 +0000 (08:57 +0000)
committer Gerrit Code Review <gerrit@onap.org>
Mon, 1 Jul 2019 08:57:52 +0000 (08:57 +0000)
diff --cc services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/ApexStarterMain.java
Simple merge
author	Ram Krishna Verma <ram.krishna.verma@est.tech>
	Mon, 1 Jul 2019 08:57:52 +0000 (08:57 +0000)
committer	Gerrit Code Review <gerrit@onap.org>
	Mon, 1 Jul 2019 08:57:52 +0000 (08:57 +0000)