fixed the merge conflict on merging #1941#1977

Closed

karuturi wants to merge 1 commit intomasterfrom

unknown repository

Commits on Feb 28, 2017

fixed an issue due to the merge conflict on merging #1941
karuturi
committed