tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / css3 / selectors3 / html / css3-modsel-d1b-expected.txt

diff --git a/LayoutTests/platform/efl/css3/selectors3/html/css3-modsel-d1b-expected.txt b/LayoutTests/platform/efl/css3/selectors3/html/css3-modsel-d1b-expected.txt
index 474d144..b4de78b 100755 (executable)
--- a/LayoutTests/platform/efl/css3/selectors3/html/css3-modsel-d1b-expected.txt
+++ b/LayoutTests/platform/efl/css3/selectors3/html/css3-modsel-d1b-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x110
   RenderBlock {HTML} at (0,0) size 800x110
     RenderBody {BODY} at (8,12) size 784x86
@@ -9,3 +10,14 @@ layer at (0,0) size 800x110
             text run at (0,0) width 192: "The following two bars should be green."
         RenderBlock {DIV} at (12,26) size 760x24 [bgcolor=#00FF00]
         RenderBlock {DIV} at (12,62) size 760x24 [bgcolor=#FF0000]
+=======
+layer at (0,0) size 800x147
+  RenderBlock {HTML} at (0,0) size 800x147
+    RenderBody {BODY} at (8,16) size 784x115
+      RenderBlock {DIV} at (0,0) size 784x115
+        RenderBlock {P} at (0,0) size 784x19
+          RenderText {#text} at (0,0) size 256x19
+            text run at (0,0) width 256: "The following two bars should be green."
+        RenderBlock {DIV} at (16,35) size 752x32 [bgcolor=#00FF00]
+        RenderBlock {DIV} at (16,83) size 752x32 [bgcolor=#FF0000]
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d