tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / block / basic / 006-expected.txt

diff --git a/LayoutTests/platform/efl/fast/block/basic/006-expected.txt b/LayoutTests/platform/efl/fast/block/basic/006-expected.txt
index 3f65e07..d966186 100755 (executable)
--- a/LayoutTests/platform/efl/fast/block/basic/006-expected.txt
+++ b/LayoutTests/platform/efl/fast/block/basic/006-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x102
   RenderBlock {HTML} at (0,0) size 800x102
     RenderBody {BODY} at (8,12) size 784x82
@@ -15,3 +16,20 @@ layer at (0,0) size 800x102
         RenderInline {SPAN} at (0,0) size 5x26
           RenderText {#text} at (48,1) size 5x26
             text run at (48,1) width 5: "|"
+=======
+layer at (0,0) size 800x133
+  RenderBlock {HTML} at (0,0) size 800x133
+    RenderBody {BODY} at (8,16) size 784x109
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 462x19
+          text run at (0,0) width 462: "The following two vertical bars should be at the same horizontal position."
+      RenderBlock {DIV} at (0,35) size 96x37
+        RenderBlock {DIV} at (64,0) size 0x37
+          RenderInline {SPAN} at (0,0) size 6x36
+            RenderText {#text} at (0,0) size 6x36
+              text run at (0,0) width 6: "|"
+      RenderBlock {DIV} at (0,72) size 784x37
+        RenderInline {SPAN} at (0,0) size 6x36
+          RenderText {#text} at (64,0) size 6x36
+            text run at (64,0) width 6: "|"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d