tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / selectors / 090b-expected.txt

diff --git a/LayoutTests/platform/efl/fast/selectors/090b-expected.txt b/LayoutTests/platform/efl/fast/selectors/090b-expected.txt
index ce26634..54238e6 100755 (executable)
--- a/LayoutTests/platform/efl/fast/selectors/090b-expected.txt
+++ b/LayoutTests/platform/efl/fast/selectors/090b-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x104
   RenderBlock {HTML} at (0,0) size 800x104
     RenderBody {BODY} at (8,12) size 784x80
@@ -15,3 +16,20 @@ layer at (0,0) size 800x104
       RenderBlock {P} at (0,66) size 784x14 [color=#008000]
         RenderText {#text} at (0,0) size 122x14
           text run at (0,0) width 122: "This text should be green."
+=======
+layer at (0,0) size 800x140
+  RenderBlock {HTML} at (0,0) size 800x140
+    RenderBody {BODY} at (8,16) size 784x108
+      RenderBlock {BLOCKQUOTE} at (40,0) size 704x19
+        RenderText {#text} at (0,0) size 181x19
+          text run at (0,0) width 181: "This text should be unstyled."
+      RenderBlock {DIV} at (0,35) size 784x19
+        RenderText {#text} at (0,0) size 181x19
+          text run at (0,0) width 181: "This text should be unstyled."
+      RenderBlock {DIV} at (0,54) size 784x19
+        RenderText {#text} at (0,0) size 181x19
+          text run at (0,0) width 181: "This text should be unstyled."
+      RenderBlock {P} at (0,89) size 784x19 [color=#008000]
+        RenderText {#text} at (0,0) size 163x19
+          text run at (0,0) width 163: "This text should be green."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d