tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / table / dynamic-caption-add-remove-before-child-expected.txt

diff --git a/LayoutTests/platform/efl/fast/table/dynamic-caption-add-remove-before-child-expected.txt b/LayoutTests/platform/efl/fast/table/dynamic-caption-add-remove-before-child-expected.txt
index b5d2d66..4d8fa7d 100755 (executable)
--- a/LayoutTests/platform/efl/fast/table/dynamic-caption-add-remove-before-child-expected.txt
+++ b/LayoutTests/platform/efl/fast/table/dynamic-caption-add-remove-before-child-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x72
   RenderBlock {html} at (0,0) size 800x72
     RenderBody {body} at (8,8) size 784x56
@@ -10,3 +11,15 @@ layer at (0,0) size 800x72
             text run at (0,14) width 34: "Text in"
             text run at (0,28) width 34: "caption"
             text run at (14,42) width 6: "1"
+=======
+layer at (0,0) size 800x92
+  RenderBlock {html} at (0,0) size 800x92
+    RenderBody {body} at (8,8) size 784x76
+      RenderTable {table} at (0,0) size 46x76
+        RenderBlock {caption} at (0,0) size 46x76
+          RenderText {#text} at (1,0) size 46x76
+            text run at (1,0) width 44: "PASS:"
+            text run at (0,19) width 46: "Text in"
+            text run at (0,38) width 46: "caption"
+            text run at (19,57) width 8: "1"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d