tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / text / stroking-decorations-expected.txt

diff --git a/LayoutTests/platform/efl/fast/text/stroking-decorations-expected.txt b/LayoutTests/platform/efl/fast/text/stroking-decorations-expected.txt
index d53c63f..55f2aca 100755 (executable)
--- a/LayoutTests/platform/efl/fast/text/stroking-decorations-expected.txt
+++ b/LayoutTests/platform/efl/fast/text/stroking-decorations-expected.txt
@@ -4,6 +4,7 @@ layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
       RenderBlock {DIV} at (0,0) size 784x148 [textFillColor=#800080] [textStrokeWidth=2.00]
+<<<<<<< HEAD
         RenderText {#text} at (0,1) size 523x145
           text run at (0,1) width 0: "Purple\x{300} fill, black stroke, complex"
           text run at (0,75) width 523: "text, black underline"
@@ -13,5 +14,16 @@ layer at (0,0) size 800x600
           text run at (0,75) width 414: "orange overline."
       RenderBlock {DIV} at (0,296) size 784x148 [textFillColor=#0000FF] [textStrokeWidth=1.33]
         RenderText {#text} at (0,1) size 596x145
+=======
+        RenderText {#text} at (0,1) size 523x146
+          text run at (0,1) width 0: "Purple\x{300} fill, black stroke, complex"
+          text run at (0,75) width 523: "text, black underline"
+      RenderBlock {DIV} at (0,148) size 784x148 [textStrokeColor=#FFA500] [textStrokeWidth=1.33]
+        RenderText {#text} at (0,1) size 636x146
+          text run at (0,1) width 636: "Orange stroke, black fill,"
+          text run at (0,75) width 414: "orange overline."
+      RenderBlock {DIV} at (0,296) size 784x148 [textFillColor=#0000FF] [textStrokeWidth=1.33]
+        RenderText {#text} at (0,1) size 596x146
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
           text run at (0,1) width 596: "No stroke, blue fill, red"
           text run at (0,75) width 594: "shadow, blue underline"