diff options
Diffstat (limited to 'sdnr/northbound/energysavings/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml')
| -rw-r--r-- | sdnr/northbound/energysavings/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sdnr/northbound/energysavings/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/sdnr/northbound/energysavings/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml index 80d1d1a3f..61bd833a0 100644 --- a/sdnr/northbound/energysavings/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml +++ b/sdnr/northbound/energysavings/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml @@ -16,7 +16,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html odl:type="default" /> <bean id="provider" +<<<<<<< HEAD class="org.onap.sdnc.northbound.sdnr.impl.EnergysavingsProvider" +======= + class="org.onap.ccsdk.features.sdnr.northbound.EnergysavingsProvider" +>>>>>>> 4a0fb45... Rename package to new ccsdk/features repo init-method="init" destroy-method="close"> <argument ref="dataBroker" /> </bean> |