From 74c062da3c746bedf0be334f23ddff5d348661d5 Mon Sep 17 00:00:00 2001
From: Murali <murali.p@huawei.com>
Date: Wed, 8 Nov 2017 06:19:03 +0000
Subject: [PATCH] Fix merge failure

Change-Id: I8f233adef503ffb7322b8f97e99dab7be00f99c1
Issue-id:VNFSDK-120
Signed-off-by: Murali <murali.p@huawei.com>
---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index f30eda76..265143d6 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>
-- 
2.16.6