[Tizen] Fix TC code conflict
authorJoogab Yun <joogab.yun@samsung.com>
Mon, 16 Sep 2019 06:26:37 +0000 (15:26 +0900)
committerJoogab Yun <joogab.yun@samsung.com>
Mon, 16 Sep 2019 06:26:43 +0000 (15:26 +0900)
This reverts commit d4dffcf5267f3fc36c284f70347c4161a94c1ec9.

Change-Id: I606fbc4b88064364fa4fee8e6b2b3500efbd5631

automated-tests/src/dali/utc-Dali-Scene.cpp

index e393366..11d55a6 100644 (file)
@@ -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();