tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / transitions / move-after-transition-expected.txt

diff --git a/LayoutTests/platform/efl/transitions/move-after-transition-expected.txt b/LayoutTests/platform/efl/transitions/move-after-transition-expected.txt
index ce840ee..a5c68f1 100755 (executable)
--- a/LayoutTests/platform/efl/transitions/move-after-transition-expected.txt
+++ b/LayoutTests/platform/efl/transitions/move-after-transition-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x148
   RenderBlock {HTML} at (0,0) size 800x148
     RenderBody {BODY} at (8,12) size 784x128
@@ -12,4 +13,18 @@ layer at (8,38) size 402x102
 layer at (159,39) size 100x100
   RenderBlock (positioned) {DIV} at (151,1) size 100x100 [bgcolor=#FF0000]
 layer at (9,39) size 100x100
+=======
+layer at (0,0) size 800x161
+  RenderBlock {HTML} at (0,0) size 800x161
+    RenderBody {BODY} at (8,16) size 784x137
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 399x19
+          text run at (0,0) width 399: "At the end of the test the green box should obscure the red box."
+      RenderBlock {DIV} at (0,137) size 784x0
+layer at (8,51) size 402x102
+  RenderBlock (relative positioned) {DIV} at (0,35) size 402x102 [border: (1px solid #000000)]
+layer at (159,52) size 100x100
+  RenderBlock (positioned) {DIV} at (151,1) size 100x100 [bgcolor=#FF0000]
+layer at (9,52) size 100x100
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
   RenderBlock (positioned) {DIV} at (1,1) size 100x100 [bgcolor=#008000]