tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / css2.1 / t0805-c5516-ibrdr-c-00-a-expected.txt

diff --git a/LayoutTests/platform/efl/css2.1/t0805-c5516-ibrdr-c-00-a-expected.txt b/LayoutTests/platform/efl/css2.1/t0805-c5516-ibrdr-c-00-a-expected.txt
index 899be39..22e7c66 100755 (executable)
--- a/LayoutTests/platform/efl/css2.1/t0805-c5516-ibrdr-c-00-a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0805-c5516-ibrdr-c-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 800x186
   RenderBlock {HTML} at (0,0) size 800x186
     RenderBody {BODY} at (8,36) size 784x114
@@ -17,4 +18,23 @@ layer at (0,0) size 800x186
         RenderInline {SPAN} at (0,0) size 443x62 [border: (24px solid #800080) (24px solid #008000) (24px solid #0000FF) (24px solid #FFFF00)]
           RenderText {#text} at (24,0) size 395x14
             text run at (24,0) width 395: "Clockwise from top, the borders should be: PURPLE, GREEN, BLUE, YELLOW."
+=======
+layer at (0,0) size 800x249
+  RenderBlock {HTML} at (0,0) size 800x249
+    RenderBody {BODY} at (8,48) size 784x153
+      RenderBlock {P} at (48,0) size 688x19
+        RenderInline {SPAN} at (0,0) size 241x25 [border: (3px solid #008000)]
+          RenderText {#text} at (3,0) size 235x19
+            text run at (3,0) width 235: "This box should have a green border."
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {P} at (48,67) size 688x19
+        RenderInline {SPAN} at (0,0) size 241x25 [border: (3px solid #008000)]
+          RenderText {#text} at (3,0) size 235x19
+            text run at (3,0) width 235: "This box should have a green border."
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {P} at (48,134) size 688x19
+        RenderInline {SPAN} at (0,0) size 596x83 [border: (32px solid #800080) (32px solid #008000) (32px solid #0000FF) (32px solid #FFFF00)]
+          RenderText {#text} at (32,0) size 532x19
+            text run at (32,0) width 532: "Clockwise from top, the borders should be: PURPLE, GREEN, BLUE, YELLOW."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
         RenderText {#text} at (0,0) size 0x0