Fix merge failure 07/22707/1 1.0.0-Amsterdam 1.0.0-ONAP v1.0.0
authorMurali <murali.p@huawei.com>
Wed, 8 Nov 2017 06:19:03 +0000 (06:19 +0000)
committerMurali <murali.p@huawei.com>
Wed, 8 Nov 2017 06:19:03 +0000 (06:19 +0000)
commit74c062da3c746bedf0be334f23ddff5d348661d5
tree82b21c88e99d95d68afeab69507b9264195ef3ee
parentf1d4f8fb18587a2a045a46b58fc1a368889cb905
Fix merge failure

Change-Id: I8f233adef503ffb7322b8f97e99dab7be00f99c1
Issue-id:VNFSDK-120
Signed-off-by: Murali <murali.p@huawei.com>
pom.xml