tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / css2.1 / t0805-c5520-brdr-b-00-a-expected.txt

diff --git a/LayoutTests/platform/efl/css2.1/t0805-c5520-brdr-b-00-a-expected.txt b/LayoutTests/platform/efl/css2.1/t0805-c5520-brdr-b-00-a-expected.txt
index 43ea7f0..9d99539 100755 (executable)
--- a/LayoutTests/platform/efl/css2.1/t0805-c5520-brdr-b-00-a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0805-c5520-brdr-b-00-a-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x75
   RenderBlock {HTML} at (0,0) size 800x75
     RenderBody {BODY} at (8,12) size 784x51
@@ -9,3 +10,14 @@ layer at (0,0) size 800x75
       RenderBlock {P} at (0,36) size 784x15 [color=#0000FF] [border: (1px solid #0000FF) none]
         RenderText {#text} at (0,0) size 314x14
           text run at (0,0) width 314: "This paragraph should have a single thin blue line directly under it."
+=======
+layer at (0,0) size 800x97
+  RenderBlock {HTML} at (0,0) size 800x97
+    RenderBody {BODY} at (8,16) size 784x65
+      RenderBlock {P} at (0,0) size 784x29 [color=#0000FF] [border: (10px double #0000FF) none]
+        RenderText {#text} at (0,0) size 374x19
+          text run at (0,0) width 374: "This paragraph should have two blue lines directly under it."
+      RenderBlock {P} at (0,45) size 784x20 [color=#0000FF] [border: (1px solid #0000FF) none]
+        RenderText {#text} at (0,0) size 420x19
+          text run at (0,0) width 420: "This paragraph should have a single thin blue line directly under it."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d