tizen beta release

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

diff --git a/LayoutTests/platform/efl/fast/selectors/nondeterministic-combinators-expected.txt b/LayoutTests/platform/efl/fast/selectors/nondeterministic-combinators-expected.txt
index 22426fa..0387035 100755 (executable)
--- a/LayoutTests/platform/efl/fast/selectors/nondeterministic-combinators-expected.txt
+++ b/LayoutTests/platform/efl/fast/selectors/nondeterministic-combinators-expected.txt
@@ -3,6 +3,7 @@ layer at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
+<<<<<<< HEAD
       RenderBlock {DIV} at (0,0) size 784x14
         RenderBlock {DIV} at (0,0) size 784x14
           RenderBlock {DIV} at (0,0) size 784x14
@@ -15,3 +16,17 @@ layer at (0,0) size 800x600
       RenderBlock {DIV} at (0,14) size 784x14 [color=#008000]
         RenderText {#text} at (0,0) size 144x14
           text run at (0,0) width 144: "This text should also be green."
+=======
+      RenderBlock {DIV} at (0,0) size 784x19
+        RenderBlock {DIV} at (0,0) size 784x19
+          RenderBlock {DIV} at (0,0) size 784x19
+            RenderBlock {DIV} at (0,0) size 784x19 [color=#008000]
+              RenderText {#text} at (0,0) size 163x19
+                text run at (0,0) width 163: "This text should be green."
+      RenderBlock {DIV} at (0,19) size 784x0
+      RenderBlock {DIV} at (0,19) size 784x0
+      RenderBlock {DIV} at (0,19) size 784x0
+      RenderBlock {DIV} at (0,19) size 784x19 [color=#008000]
+        RenderText {#text} at (0,0) size 192x19
+          text run at (0,0) width 192: "This text should also be green."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d