tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / css2.1 / t0805-c5522-brdr-01-b-g-expected.txt

diff --git a/LayoutTests/platform/efl/css2.1/t0805-c5522-brdr-01-b-g-expected.txt b/LayoutTests/platform/efl/css2.1/t0805-c5522-brdr-01-b-g-expected.txt
index 690e847..21c43e2 100755 (executable)
--- a/LayoutTests/platform/efl/css2.1/t0805-c5522-brdr-01-b-g-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0805-c5522-brdr-01-b-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 800x176
   RenderBlock {HTML} at (0,0) size 800x176
     RenderBody {BODY} at (8,12) size 784x140
@@ -8,5 +9,15 @@ layer at (0,0) size 800x176
           text run at (0,0) width 197: "There should be no border around the cat:"
       RenderBlock {DIV} at (24,38) size 736x102 [color=#FF0000]
         RenderInline {A} at (0,0) size 98x14 [color=#0000EE]
+=======
+layer at (0,0) size 800x202
+  RenderBlock {HTML} at (0,0) size 800x202
+    RenderBody {BODY} at (8,16) size 784x154
+      RenderBlock {P} at (0,0) size 784x19 [color=#0000FF]
+        RenderText {#text} at (0,0) size 264x19
+          text run at (0,0) width 264: "There should be no border around the cat:"
+      RenderBlock {DIV} at (32,51) size 720x103 [color=#FF0000]
+        RenderInline {A} at (0,0) size 98x19 [color=#0000EE]
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
           RenderImage {IMG} at (0,0) size 98x99
         RenderText {#text} at (0,0) size 0x0