EditDescriptorModelProperties.js merge issue fix
authorLaurence Maultsby <laurence.maultsby@riftio.com>
Thu, 20 Apr 2017 15:53:03 +0000 (11:53 -0400)
committerkashalkar <kiran.kashalkar@riftio.com>
Thu, 20 Apr 2017 15:58:53 +0000 (16:58 +0100)
commit3581a59b106203a259ee1ce8c21e2e8a0cc9f348
tree951ae97b6fbcfeddd726664e74c7246e600ea200
parent83ebeec87b6e614f2b870e37326015a9ed468346
EditDescriptorModelProperties.js merge issue fix

Signed-off-by: Laurence Maultsby <laurence.maultsby@riftio.com>
skyquake/plugins/composer/src/src/components/EditDescriptorModelProperties.js