tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / css2.1 / t0804-c5509-padn-l-03-f-g-expected.txt

diff --git a/LayoutTests/platform/efl/css2.1/t0804-c5509-padn-l-03-f-g-expected.txt b/LayoutTests/platform/efl/css2.1/t0804-c5509-padn-l-03-f-g-expected.txt
index dd62529..4073129 100755 (executable)
--- a/LayoutTests/platform/efl/css2.1/t0804-c5509-padn-l-03-f-g-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0804-c5509-padn-l-03-f-g-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x90
   RenderBlock {HTML} at (0,0) size 800x90
     RenderBody {BODY} at (8,12) size 784x66
@@ -13,3 +14,18 @@ layer at (0,0) size 800x90
         RenderImage {IMG} at (0,10) size 24x1
         RenderText {#text} at (24,0) size 28x14
           text run at (24,0) width 28: "TEST"
+=======
+layer at (0,0) size 800x121
+  RenderBlock {HTML} at (0,0) size 800x121
+    RenderBody {BODY} at (8,16) size 784x89
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 240x19
+          text run at (0,0) width 240: "The next two bars should be identical:"
+      RenderBlock {DIV} at (16,35) size 192x19 [color=#FFFF00] [bgcolor=#000080]
+        RenderText {#text} at (32,0) size 39x19
+          text run at (32,0) width 39: "TEST"
+      RenderBlock {DIV} at (16,70) size 192x19 [color=#FFFF00] [bgcolor=#000080]
+        RenderImage {IMG} at (0,14) size 32x1
+        RenderText {#text} at (32,0) size 39x19
+          text run at (32,0) width 39: "TEST"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d