Merge of new rebased code

[appc.git] / appc-common / src / main / java / org / openecomp / appc / configuration / package.html

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 4460a9e..5991f91 100644 (file)
--- a/appc-common/src/main/java/org/openecomp/appc/configuration/package.html
+++ b/appc-common/src/main/java/org/openecomp/appc/configuration/package.html
@@ -168,3 +168,4 @@
   </p>
 </body>
 </html>
+>>>>>>> app-controller/master:appc-common/src/main/java/org/openecomp/appc/configuration/package.html