X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=LayoutTests%2Fplatform%2Fefl%2Fcss3%2Fselectors3%2Fxml%2Fcss3-modsel-130-expected.txt;h=1bd3c039e67dda9cb9a3c09a74b0ae1fdb910e2e;hb=b96e33af77ac7d81a666d5aa202235b793aeeb21;hp=5d04078e74d7724ab09b8cb2418762f8c061ded9;hpb=2632619e54bc9f41ccea7c574710fe213e49212d;p=framework%2Fweb%2Fwebkit-efl.git

diff --git a/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-130-expected.txt b/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-130-expected.txt
index 5d04078..1bd3c03 100755
--- a/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-130-expected.txt
+++ b/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-130-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x78
   RenderBlock {test} at (0,0) size 800x78
     RenderBlock {div} at (0,0) size 800x66
@@ -12,3 +13,17 @@ layer at (0,0) size 800x78
       RenderBlock {s} at (0,52) size 800x14
         RenderText {#text} at (0,0) size 166x14
           text run at (0,0) width 166: "This paragraph should be unstyled."
+=======
+layer at (0,0) size 800x105
+  RenderBlock {test} at (0,0) size 800x105
+    RenderBlock {div} at (0,0) size 800x89
+      RenderBlock {q} at (0,0) size 800x19 [bgcolor=#00FF00]
+        RenderText {#text} at (0,0) size 308x19
+          text run at (0,0) width 308: "This paragraph should have a green background."
+      RenderBlock {r} at (0,35) size 800x19
+        RenderText {#text} at (0,0) size 221x19
+          text run at (0,0) width 221: "This paragraph should be unstyled."
+      RenderBlock {s} at (0,70) size 800x19
+        RenderText {#text} at (0,0) size 221x19
+          text run at (0,0) width 221: "This paragraph should be unstyled."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d