From: Pamela Dragosh <pdragosh@research.att.com>
Date: Thu, 6 Feb 2020 20:38:28 +0000 (+0000)
Subject: Merge "Updating module names to resolve conflicts"
X-Git-Tag: 1.6.0~30
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=835686f407a2e9e62eff325e8f93768d4fc44516;p=policy%2Fdrools-pdp.git

Merge "Updating module names to resolve conflicts"
---

835686f407a2e9e62eff325e8f93768d4fc44516