From: Joogab Yun <joogab.yun@samsung.com>
Date: Mon, 16 Sep 2019 06:25:07 +0000 (+0900)
Subject: Revert "[Tizen] Fix TC code conflict"
X-Git-Tag: accepted/tizen/unified/20190924.071740~9
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d4dffcf5267f3fc36c284f70347c4161a94c1ec9;p=platform%2Fcore%2Fuifw%2Fdali-core.git

Revert "[Tizen] Fix TC code conflict"

This reverts commit 4440dd2f922b7572d51bf6ae870836b267c26993.
---

diff --git a/automated-tests/src/dali/utc-Dali-Scene.cpp b/automated-tests/src/dali/utc-Dali-Scene.cpp
index 11d55a6..e393366 100644
--- a/automated-tests/src/dali/utc-Dali-Scene.cpp
+++ b/automated-tests/src/dali/utc-Dali-Scene.cpp
@@ -1130,8 +1130,11 @@ int UtcDaliSceneSurfaceResizedAdditionalScene(void)
   Vector2 originalSurfaceSize( 500.0f, 1000.0f );
 
   TestRenderSurface surface( PositionSize( 0.0f, 0.0f, originalSurfaceSize.width, originalSurfaceSize.height ) );
-
+<<<<<<< HEAD
   auto scene = Integration::Scene::New( surface );
+=======
+  scene.SetSurface( surface, false );
+>>>>>>> e6df4fb... Support Client and Screen Rotation
 
   // Ensure stage size does NOT match the surface size
   auto stage = Stage::GetCurrent();