tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / repaint / shadow-multiple-strict-vertical-expected.txt

diff --git a/LayoutTests/platform/efl/fast/repaint/shadow-multiple-strict-vertical-expected.txt b/LayoutTests/platform/efl/fast/repaint/shadow-multiple-strict-vertical-expected.txt
index fbe6557..b49841f 100755 (executable)
--- a/LayoutTests/platform/efl/fast/repaint/shadow-multiple-strict-vertical-expected.txt
+++ b/LayoutTests/platform/efl/fast/repaint/shadow-multiple-strict-vertical-expected.txt
@@ -4,9 +4,17 @@ layer at (0,0) size 800x375
   RenderBlock {HTML} at (0,0) size 800x375
     RenderBody {BODY} at (8,20) size 784x255
       RenderBlock {DIV} at (20,0) size 744x55
+<<<<<<< HEAD
         RenderInline {SPAN} at (0,0) size 313x53
           RenderText {#text} at (0,1) size 313x53
             text run at (0,1) width 313: "      multiple    "
         RenderText {#text} at (313,1) size 348x53
           text run at (313,1) width 348: "     shadows      "
+=======
+        RenderInline {SPAN} at (0,0) size 313x55
+          RenderText {#text} at (0,0) size 313x55
+            text run at (0,0) width 313: "      multiple    "
+        RenderText {#text} at (313,0) size 348x55
+          text run at (313,0) width 348: "     shadows      "
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
       RenderBlock {DIV} at (100,155) size 100x100