tizen beta release

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

diff --git a/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-156c-expected.txt b/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-156c-expected.txt
index 10624c7..06a825a 100755 (executable)
--- a/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-156c-expected.txt
+++ b/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-156c-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
     RenderBlock {p} at (0,12) size 800x14 [bgcolor=#00FF00]
       RenderText {#text} at (0,0) size 200x14
         text run at (0,0) width 200: "This line should have a green background."
+=======
+layer at (0,0) size 800x51
+  RenderBlock {test} at (0,0) size 800x51
+    RenderBlock {p} at (0,16) size 800x19 [bgcolor=#00FF00]
+      RenderText {#text} at (0,0) size 268x19
+        text run at (0,0) width 268: "This line should have a green background."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d