Merge "Add E2E service BPMNs resolve conflicts"
authorChuanyu Chen <chenchuanyu@huawei.com>
Wed, 20 Sep 2017 07:43:10 +0000 (07:43 +0000)
committerGerrit Code Review <gerrit@onap.org>
Wed, 20 Sep 2017 07:43:10 +0000 (07:43 +0000)

Trivial merge