tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / borders / border-radius-split-inline-expected.txt

diff --git a/LayoutTests/platform/efl/fast/borders/border-radius-split-inline-expected.txt b/LayoutTests/platform/efl/fast/borders/border-radius-split-inline-expected.txt
index cb278c3..07d3cd4 100755 (executable)
--- a/LayoutTests/platform/efl/fast/borders/border-radius-split-inline-expected.txt
+++ b/LayoutTests/platform/efl/fast/borders/border-radius-split-inline-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x208
   RenderBlock {HTML} at (0,0) size 800x208
     RenderBody {BODY} at (8,12) size 784x188
@@ -7,6 +8,15 @@ layer at (0,0) size 800x208
         RenderText {#text} at (0,0) size 252x14
           text run at (0,0) width 252: "Tests border-radius and box-shadow on a split inline."
       RenderBlock {DIV} at (0,26) size 200x162
+=======
+layer at (0,0) size 800x221
+  RenderBlock {HTML} at (0,0) size 800x221
+    RenderBody {BODY} at (8,16) size 784x197
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 334x19
+          text run at (0,0) width 334: "Tests border-radius and box-shadow on a split inline."
+      RenderBlock {DIV} at (0,35) size 200x162
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
         RenderInline {SPAN} at (0,0) size 199x148 [border: (2px solid #008000)]
           RenderText {#text} at (2,9) size 197x144
             text run at (2,9) width 146: "I am a span"