Merge "Introducing simple merge strategy for config subsystem"
[controller.git] / opendaylight / netconf / netconf-cli / .gitignore
1 *.log
2 cache