tizen beta release

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

diff --git a/LayoutTests/platform/efl/css3/selectors3/html/css3-modsel-70-expected.txt b/LayoutTests/platform/efl/css3/selectors3/html/css3-modsel-70-expected.txt
index 56b89d0..3ed6785 100755 (executable)
--- a/LayoutTests/platform/efl/css3/selectors3/html/css3-modsel-70-expected.txt
+++ b/LayoutTests/platform/efl/css3/selectors3/html/css3-modsel-70-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x42
   RenderBlock {HTML} at (0,0) size 800x42
     RenderBody {BODY} at (8,12) size 784x18
@@ -10,3 +11,15 @@ layer at (0,0) size 800x42
         RenderInline {SPAN} at (0,0) size 290x14 [bgcolor=#00FF00]
           RenderText {#text} at (23,1) size 290x14
             text run at (23,1) width 290: "Everything in this paragraph should have a green background"
+=======
+layer at (0,0) size 800x53
+  RenderBlock {HTML} at (0,0) size 800x53
+    RenderBody {BODY} at (8,16) size 784x21
+      RenderBlock {P} at (0,0) size 784x21
+        RenderBlock {INPUT} at (4,6) size 12x12 [bgcolor=#00FF00]
+        RenderText {#text} at (20,0) size 4x19
+          text run at (20,0) width 4: " "
+        RenderInline {SPAN} at (0,0) size 388x19 [bgcolor=#00FF00]
+          RenderText {#text} at (24,0) size 388x19
+            text run at (24,0) width 388: "Everything in this paragraph should have a green background"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d