tizen beta release

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

diff --git a/LayoutTests/platform/efl/fast/selectors/061-expected.txt b/LayoutTests/platform/efl/fast/selectors/061-expected.txt
index d716510..fca40d8 100755 (executable)
--- a/LayoutTests/platform/efl/fast/selectors/061-expected.txt
+++ b/LayoutTests/platform/efl/fast/selectors/061-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x30
   RenderBlock {HTML} at (0,0) size 800x30
     RenderBody {BODY} at (8,8) size 784x14
@@ -9,3 +10,13 @@ layer at (0,0) size 800x30
             text run at (0,0) width 212: "This anchor should have a green background"
         RenderText {#text} at (212,0) size 354x14
           text run at (212,0) width 354: " (Note: You must have visited http://www.w3.org/ for this test to be valid.)"
+=======
+layer at (0,0) size 800x35
+  RenderBlock {HTML} at (0,0) size 800x35
+    RenderBody {BODY} at (8,8) size 784x19
+      RenderBlock {DIV} at (0,0) size 784x19
+        RenderInline {A} at (0,0) size 284x19 [color=#551A8B] [bgcolor=#00FF00]
+          RenderText {#text} at (0,0) size 284x19
+            text run at (0,0) width 284: "This anchor should have a green background"
+        RenderText {#text} at (0,0) size 0x0
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d