From 75552e8d3b4e8db822723d0c177afe1becc4b4cc Mon Sep 17 00:00:00 2001 From: Joogab Yun Date: Mon, 16 Sep 2019 15:26:37 +0900 Subject: [PATCH] [Tizen] Fix TC code conflict This reverts commit d4dffcf5267f3fc36c284f70347c4161a94c1ec9. Change-Id: I606fbc4b88064364fa4fee8e6b2b3500efbd5631 --- automated-tests/src/dali/utc-Dali-Scene.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/automated-tests/src/dali/utc-Dali-Scene.cpp b/automated-tests/src/dali/utc-Dali-Scene.cpp index e393366..11d55a6 100644 --- a/automated-tests/src/dali/utc-Dali-Scene.cpp +++ b/automated-tests/src/dali/utc-Dali-Scene.cpp @@ -1130,11 +1130,8 @@ 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(); -- 2.7.4