| commit | 74c062da3c746bedf0be334f23ddff5d348661d5 | [log] [tgz] |
|---|---|---|
| author | Murali <murali.p@huawei.com> | Wed Nov 08 06:19:03 2017 +0000 |
| committer | Murali <murali.p@huawei.com> | Wed Nov 08 06:19:03 2017 +0000 |
| tree | 82b21c88e99d95d68afeab69507b9264195ef3ee | |
| parent | f1d4f8fb18587a2a045a46b58fc1a368889cb905 [diff] [blame] |
Fix merge failure Change-Id: I8f233adef503ffb7322b8f97e99dab7be00f99c1 Issue-id:VNFSDK-120 Signed-off-by: Murali <murali.p@huawei.com>
diff --git a/pom.xml b/pom.xml index f30eda7..265143d 100644 --- a/pom.xml +++ b/pom.xml
@@ -21,6 +21,7 @@ <groupId>org.onap.oparent</groupId> <artifactId>oparent</artifactId> <version>0.1.1</version> + <relativePath>../../oparent</relativePath> </parent> <modelVersion>4.0.0</modelVersion>