tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / css3 / selectors3 / xml / css3-modsel-21c-expected.txt

diff --git a/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-21c-expected.txt b/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-21c-expected.txt
index 189be33..4207fb1 100755 (executable)
--- a/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-21c-expected.txt
+++ b/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-21c-expected.txt
@@ -1,7 +1,15 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x38
   RenderBlock {test} at (0,0) size 800x38 [bgcolor=#008000]
     RenderBlock {p} at (0,12) size 800x14
       RenderText {#text} at (0,0) size 127x14
         text run at (0,0) width 127: "This page should be green."
+=======
+layer at (0,0) size 800x51
+  RenderBlock {test} at (0,0) size 800x51 [bgcolor=#008000]
+    RenderBlock {p} at (0,16) size 800x19
+      RenderText {#text} at (0,0) size 170x19
+        text run at (0,0) width 170: "This page should be green."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d