[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)
This reverts commit 78f946df888f4f0be0f403cac5c058cd8716bfbf.

Change-Id: I64f983a1a78793e4404cbc4e752c9a57610ef515

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();