From: Rajesh Velandy <rajesh.velandy@riftio.com>
Date: Mon, 25 Sep 2017 15:15:25 +0000 (+0000)
Subject: Fixed the vnfd-model which removed Adam's changes doing merge resolution
X-Git-Tag: v3.0.0rc02~1
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FIM.git;a=commitdiff_plain;h=ce30ffe01241f5ffb2e7bb860dfbcfac4795902c;hp=ce30ffe01241f5ffb2e7bb860dfbcfac4795902c

Fixed the vnfd-model which removed Adam's changes doing merge resolution

Change-Id: I89c792103f3413c360069d4d8004d60acc4adb1a
---