tizen beta release

[profile/ivi/webkit-efl.git] / LayoutTests / platform / efl / css2.1 / t0803-c5504-imrgn-l-05-b-ag-expected.txt

diff --git a/LayoutTests/platform/efl/css2.1/t0803-c5504-imrgn-l-05-b-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t0803-c5504-imrgn-l-05-b-ag-expected.txt
index 01c2b75..8d2b9f3 100755 (executable)
--- a/LayoutTests/platform/efl/css2.1/t0803-c5504-imrgn-l-05-b-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0803-c5504-imrgn-l-05-b-ag-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x104
   RenderBlock {HTML} at (0,0) size 800x104
     RenderBody {BODY} at (8,12) size 784x77
@@ -7,6 +8,15 @@ layer at (0,0) size 800x104
         RenderText {#text} at (0,0) size 205x14
           text run at (0,0) width 205: "The following two bars should be identical:"
       RenderBlock {DIV} at (15,29) size 195x15
+=======
+layer at (0,0) size 800x114
+  RenderBlock {HTML} at (0,0) size 800x114
+    RenderBody {BODY} at (8,16) size 784x83
+      RenderBlock {P} at (0,0) size 784x19 [color=#000080]
+        RenderText {#text} at (0,0) size 274x19
+          text run at (0,0) width 274: "The following two bars should be identical:"
+      RenderBlock {DIV} at (15,35) size 195x15
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
         RenderBlock {P} at (0,0) size 195x15 [color=#00FF00] [bgcolor=#FFFF00]
           RenderText {#text} at (0,0) size 135x15
             text run at (0,0) width 135: "xx xx xx "
@@ -15,7 +25,11 @@ layer at (0,0) size 800x104
               text run at (75,0) width 90: "xx xx "
           RenderText {#text} at (165,0) size 30x15
             text run at (165,0) width 30: "xx"
+<<<<<<< HEAD
       RenderBlock {DIV} at (15,59) size 754x18
+=======
+      RenderBlock {DIV} at (15,65) size 754x18
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
         RenderImage {IMG} at (0,0) size 15x15
         RenderImage {IMG} at (15,0) size 15x15
         RenderImage {IMG} at (30,0) size 15x15