nipendar
commented
6 years ago The conflict was due to a diverging commit which deleted files host_ctrl, helper and routes files in issue2 branch while issue3 branch had code changes for those files. Closing this in favor of a new cherry-picked PR
work in progress...this issue is dependent on issue 5 i.e need asset created in TD and its ID attached to the host, in order to fetch asset data from TD