[Tizen] Fix TC code conflict
authorJoogab Yun <joogab.yun@samsung.com>
Mon, 2 Sep 2019 06:57:33 +0000 (15:57 +0900)
committerJoogab Yun <joogab.yun@samsung.com>
Mon, 2 Sep 2019 06:57:36 +0000 (15:57 +0900)
commitcbc07b5790faa3bd06c30a70d3517aa904642660
tree546938f2e49a3836cafdcbb4454dc57c35895dbb
parent2bdf0247f08fab6cee2d25549eb4682547b260e2
[Tizen] Fix TC code conflict

This reverts commit 78f946df888f4f0be0f403cac5c058cd8716bfbf.

Change-Id: I64f983a1a78793e4404cbc4e752c9a57610ef515
automated-tests/src/dali/utc-Dali-Scene.cpp