diff options
Diffstat (limited to 'appc-common/src/main/java/org/openecomp/appc/configuration/package.html')
| -rw-r--r-- | appc-common/src/main/java/org/openecomp/appc/configuration/package.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/appc-common/src/main/java/org/openecomp/appc/configuration/package.html b/appc-common/src/main/java/org/openecomp/appc/configuration/package.html index 131ba5ced..c6889da9a 100644 --- a/appc-common/src/main/java/org/openecomp/appc/configuration/package.html +++ b/appc-common/src/main/java/org/openecomp/appc/configuration/package.html @@ -171,4 +171,4 @@ </p> </body> </html> ->>>>>>> app-controller/master:appc-common/src/main/java/org/openecomp/appc/configuration/package.html +>>>>>>> app-controller/master:appc-common/src/main/java/org/onap/appc/configuration/package.html |