X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=features-test%2Fsrc%2Fmain%2Fresources%2Ffeatures.xml;h=0ee87f300025ebc52fbbdc255fb1625fcc131c7a;hb=a75e11f6a8cf6a7d422f2d1bf0c0010819c2f9d8;hp=4cde1cbe99931779d2e0efb491fa3cb14e1efea1;hpb=a52e8ba7f3859cf2d4a3d9dc866897cadc9c0e5c;p=integration%2Fdistribution.git

diff --git a/features-test/src/main/resources/features.xml b/features-test/src/main/resources/features.xml
index 4cde1cbe..0ee87f30 100644
--- a/features-test/src/main/resources/features.xml
+++ b/features-test/src/main/resources/features.xml
@@ -98,9 +98,7 @@
         <feature version='${feature.netide.version}'>odl-netide-rest</feature>
         <feature version='${feature.netide.version}'>odl-netide-app</feature>
         <feature version='${feature.ocpplugin.version}'>odl-ocpplugin-all</feature>
-        <!-- Issue with of-config merge requires this line commented out
         <feature version='${feature.of-config.version}'>odl-of-config-all</feature>
-        -->
         <feature version='${feature.openflowplugin.version}'>odl-openflowplugin-flow-services</feature>
         <feature version='${feature.openflowplugin.version}'>odl-openflowplugin-flow-services-rest</feature>
         <feature version='${feature.openflowplugin.version}'>odl-openflowplugin-flow-services-ui</feature>