tizen beta release

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

diff --git a/LayoutTests/platform/efl/fast/selectors/059-expected.txt b/LayoutTests/platform/efl/fast/selectors/059-expected.txt
index f853b61..c74e909 100755 (executable)
--- a/LayoutTests/platform/efl/fast/selectors/059-expected.txt
+++ b/LayoutTests/platform/efl/fast/selectors/059-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x90
   RenderBlock {HTML} at (0,0) size 800x90
     RenderBody {BODY} at (8,12) size 784x66
@@ -14,4 +15,20 @@ layer at (0,0) size 800x90
           RenderInline {SPAN} at (0,0) size 214x14 [color=#00FF00]
             RenderText {#text} at (0,0) size 214x14
               text run at (0,0) width 214: "This paragraph should be in green characters."
+=======
+layer at (0,0) size 800x121
+  RenderBlock {HTML} at (0,0) size 800x121
+    RenderBody {BODY} at (8,16) size 784x89
+      RenderBlock {DIV} at (0,0) size 784x89
+        RenderBlock {P} at (0,0) size 784x19 [color=#00FF00]
+          RenderText {#text} at (0,0) size 286x19
+            text run at (0,0) width 286: "This paragraph should be in green characters."
+        RenderBlock {P} at (0,35) size 784x19 [color=#00FF00]
+          RenderText {#text} at (0,0) size 286x19
+            text run at (0,0) width 286: "This paragraph should be in green characters."
+        RenderBlock {P} at (0,70) size 784x19 [color=#FF0000]
+          RenderInline {SPAN} at (0,0) size 286x19 [color=#00FF00]
+            RenderText {#text} at (0,0) size 286x19
+              text run at (0,0) width 286: "This paragraph should be in green characters."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
           RenderText {#text} at (0,0) size 0x0