Merge "fix db version conflict issue"
authorDan Timoney <dtimoney@att.com>
Wed, 8 Apr 2020 15:40:14 +0000 (15:40 +0000)
committerGerrit Code Review <gerrit@onap.org>
Wed, 8 Apr 2020 15:40:14 +0000 (15:40 +0000)

Trivial merge