tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / css2.1 / t0804-c5507-ipadn-r-00-b-ag-expected.txt

diff --git a/LayoutTests/platform/efl/css2.1/t0804-c5507-ipadn-r-00-b-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t0804-c5507-ipadn-r-00-b-ag-expected.txt
index 29683fc..59b1273 100755 (executable)
--- a/LayoutTests/platform/efl/css2.1/t0804-c5507-ipadn-r-00-b-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0804-c5507-ipadn-r-00-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 800x86
   RenderBlock {HTML} at (0,0) size 800x86
     RenderBody {BODY} at (8,12) size 784x59
@@ -7,6 +8,15 @@ layer at (0,0) size 800x86
         RenderText {#text} at (0,0) size 203x14
           text run at (0,0) width 203: "There should be a green vertical bar below:"
       RenderBlock {DIV} at (15,29) size 120x30 [color=#FFFFFF] [bgcolor=#FF0000]
+=======
+layer at (0,0) size 800x96
+  RenderBlock {HTML} at (0,0) size 800x96
+    RenderBody {BODY} at (8,16) size 784x65
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 273x19
+          text run at (0,0) width 273: "There should be a green vertical bar below:"
+      RenderBlock {DIV} at (15,35) size 120x30 [color=#FFFFFF] [bgcolor=#FF0000]
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
         RenderBlock {P} at (0,0) size 105x30 [bgcolor=#FFFFFF]
           RenderText {#text} at (0,0) size 15x15
             text run at (0,0) width 15: "x"