Merge changes from topics "VID-45", "VID-44"
authorIttay Stern <ittay.stern@att.com>
Thu, 12 Dec 2019 16:20:59 +0000 (16:20 +0000)
committerGerrit Code Review <gerrit@onap.org>
Thu, 12 Dec 2019 16:20:59 +0000 (16:20 +0000)
commitca8f3583c919bc5ce2d66c7f783f7dce4cf5a955
tree8635167061ea830d2ae5de74c75fda82fc6f66c1
parente90eb82a3d10dfd2675b78dfd5ef2abce1a49e9d
parentaa283f736b1892426303582d141d3d12cb19b162
Merge changes from topics "VID-45", "VID-44"

* changes:
  Merge this if statement with the enclosing one.
  Merge this if statement with the enclosing one.
vid-app-common/src/main/webapp/app/vid/scripts/controller/InstantiationController.js