re base code

Change-Id: I12a5ca14a6d8a87e9316b9ff362eb131105f98a5
Issue-ID: SDC-1566
Signed-off-by: Michael Lando <ml636r@att.com>

1 files changed, 0 insertions, 17 deletions

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/property/ComplexPropertyValueMerger.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/property/ComplexPropertyValueMerger.java
deleted file mode 100644
index a68e28024c..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/property/ComplexPropertyValueMerger.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.openecomp.sdc.be.components.merge.property;
-
-import java.util.List;
-
-public class ComplexPropertyValueMerger extends PropertyValueMerger {
-
-    private static final ComplexPropertyValueMerger INSTANCE = new ComplexPropertyValueMerger();
-
-    public static PropertyValueMerger getInstance() {
-        return INSTANCE;
-    }
-
-    @Override
-    Object merge(Object oldVal, Object newVal, List<String> someStrings) {
-        return mergeValues(oldVal, newVal, someStrings);
-    }
-}