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)
Signed-off-by: Laurence Maultsby <laurence.maultsby@riftio.com>

No differences found