tizen beta release

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

diff --git a/LayoutTests/platform/efl/css3/selectors3/xhtml/css3-modsel-4-expected.txt b/LayoutTests/platform/efl/css3/selectors3/xhtml/css3-modsel-4-expected.txt
index 90f36e7..0aa8684 100755 (executable)
--- a/LayoutTests/platform/efl/css3/selectors3/xhtml/css3-modsel-4-expected.txt
+++ b/LayoutTests/platform/efl/css3/selectors3/xhtml/css3-modsel-4-expected.txt
@@ -1,8 +1,17 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x38
   RenderBlock {html} at (0,0) size 800x38
     RenderBody {body} at (8,12) size 784x14
       RenderBlock {p} at (0,0) size 784x14 [bgcolor=#00FF00]
         RenderText {#text} at (0,0) size 227x14
           text run at (0,0) width 227: "This paragraph should have a green background"
+=======
+layer at (0,0) size 800x51
+  RenderBlock {html} at (0,0) size 800x51
+    RenderBody {body} at (8,16) size 784x19
+      RenderBlock {p} at (0,0) size 784x19 [bgcolor=#00FF00]
+        RenderText {#text} at (0,0) size 304x19
+          text run at (0,0) width 304: "This paragraph should have a green background"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d