Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
| inline |
side by side
Introducing simple merge strategy for config subsystem
[controller.git]
/
opendaylight
/
config
/
yang-test
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
config
/
yang
/
test
/
impl
/
NetconfTestImplModuleStub.txt
diff --git
a/opendaylight/config/yang-test/src/main/java/org/opendaylight/controller/config/yang/test/impl/NetconfTestImplModuleStub.txt
b/opendaylight/config/yang-test/src/main/java/org/opendaylight/controller/config/yang/test/impl/NetconfTestImplModuleStub.txt
index 6515412f240231c1310b456bcdfb84159f20f578..dbb6fe6d67a3f1d07876ffcac3ee52201267a632 100644
(file)
--- a/
opendaylight/config/yang-test/src/main/java/org/opendaylight/controller/config/yang/test/impl/NetconfTestImplModuleStub.txt
+++ b/
opendaylight/config/yang-test/src/main/java/org/opendaylight/controller/config/yang/test/impl/NetconfTestImplModuleStub.txt
@@
-1
+1
@@
-return NetconfTestImplModuleUtil.registerRuntimeBeans(this);
+return
org.opendaylight.controller.config.yang.test.util.
NetconfTestImplModuleUtil.registerRuntimeBeans(this);