Merge "vfModule.model.info getModel use vfModule constructor"

author Amichai Hemli <amichai.hemli@intl.att.com>

Wed, 18 Dec 2019 07:45:57 +0000 (07:45 +0000)

committer Gerrit Code Review <gerrit@onap.org>

Wed, 18 Dec 2019 07:45:57 +0000 (07:45 +0000)
author Amichai Hemli <amichai.hemli@intl.att.com>
Wed, 18 Dec 2019 07:45:57 +0000 (07:45 +0000)
committer Gerrit Code Review <gerrit@onap.org>
Wed, 18 Dec 2019 07:45:57 +0000 (07:45 +0000)
diff --cc vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vfModule/vfModule.model.info.spec.ts
Simple merge
diff --cc vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vfModule/vfModule.model.info.ts
Simple merge
author	Amichai Hemli <amichai.hemli@intl.att.com>
	Wed, 18 Dec 2019 07:45:57 +0000 (07:45 +0000)
committer	Gerrit Code Review <gerrit@onap.org>
	Wed, 18 Dec 2019 07:45:57 +0000 (07:45 +0000)
		1	2
vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vfModule/vfModule.model.info.spec.ts	patch \|	diff1 \|	diff2 \|	blob \| history
vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vfModule/vfModule.model.info.ts	patch \|	diff1 \|	diff2 \|	blob \| history