tizen beta release

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

diff --git a/LayoutTests/platform/efl/fast/selectors/009-expected.txt b/LayoutTests/platform/efl/fast/selectors/009-expected.txt
index a80e0e2..7d2238f 100755 (executable)
--- a/LayoutTests/platform/efl/fast/selectors/009-expected.txt
+++ b/LayoutTests/platform/efl/fast/selectors/009-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x52
   RenderBlock {HTML} at (0,0) size 800x52
     RenderBody {BODY} at (8,12) size 784x28
@@ -9,3 +10,14 @@ layer at (0,0) size 800x52
         RenderBR {BR} at (227,0) size 0x14
         RenderText {#text} at (0,14) size 199x14
           text run at (0,14) width 199: "because its title attribute begins with \"foo\""
+=======
+layer at (0,0) size 800x70
+  RenderBlock {HTML} at (0,0) size 800x70
+    RenderBody {BODY} at (8,16) size 784x38
+      RenderBlock {P} at (0,0) size 784x38 [bgcolor=#00FF00]
+        RenderText {#text} at (0,0) size 304x19
+          text run at (0,0) width 304: "This paragraph should have a green background"
+        RenderBR {BR} at (304,0) size 0x19
+        RenderText {#text} at (0,19) size 266x19
+          text run at (0,19) width 266: "because its title attribute begins with \"foo\""
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d