diff options
Diffstat (limited to 'sdnr/northbound/energysavings/README.md')
| -rw-r--r-- | sdnr/northbound/energysavings/README.md | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sdnr/northbound/energysavings/README.md b/sdnr/northbound/energysavings/README.md index ce20d0d94..c63555cde 100644 --- a/sdnr/northbound/energysavings/README.md +++ b/sdnr/northbound/energysavings/README.md @@ -5,7 +5,11 @@ If creation was successful 'mvn clean install' should run without errors. # Modules * provider +<<<<<<< HEAD - implementation code goes here +======= + - implementation code goe shere +>>>>>>> 4a0fb45... Rename package to new ccsdk/features repo * features - manages packaging the project into a feature repository * model |