X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=LayoutTests%2Fplatform%2Fefl%2Ffast%2Fselectors%2F039-expected.txt;h=82e8905be9530f9e4992477c1f7602e22b937b6e;hb=b96e33af77ac7d81a666d5aa202235b793aeeb21;hp=96016548b3d7d6e6383fb5814ea62f0e1b3ebd69;hpb=2632619e54bc9f41ccea7c574710fe213e49212d;p=framework%2Fweb%2Fwebkit-efl.git

diff --git a/LayoutTests/platform/efl/fast/selectors/039-expected.txt b/LayoutTests/platform/efl/fast/selectors/039-expected.txt
index 9601654..82e8905 100755
--- a/LayoutTests/platform/efl/fast/selectors/039-expected.txt
+++ b/LayoutTests/platform/efl/fast/selectors/039-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x52
   RenderBlock {HTML} at (0,0) size 800x52
     RenderBody {BODY} at (8,12) size 784x28
@@ -10,3 +11,15 @@ layer at (0,0) size 800x52
         RenderText {#text} at (15,11) size 361x14
           text run at (15,11) width 249: "his very long paragraph should have a big first letter "
           text run at (264,11) width 112: "with green background."
+=======
+layer at (0,0) size 800x69
+  RenderBlock {HTML} at (0,0) size 800x69
+    RenderBody {BODY} at (8,16) size 784x37
+      RenderBlock {P} at (0,0) size 784x37
+        RenderInline (generated) at (0,0) size 20x36 [bgcolor=#00FF00]
+          RenderText {#text} at (0,0) size 20x36
+            text run at (0,0) width 20: "T"
+        RenderText {#text} at (20,14) size 481x19
+          text run at (20,14) width 331: "his very long paragraph should have a big first letter "
+          text run at (351,14) width 150: "with green background."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d