From 687297e3c642c9056587a57a5fa853085ed12623 Mon Sep 17 00:00:00 2001 From: Wonsik Jung Date: Fri, 30 Aug 2019 16:34:29 +0900 Subject: [PATCH] [Tizen] Fix TC code conflict Change-Id: I73d7cfb6095afa092635c98bf7d93b32c9c605f1 --- 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