tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / css2.1 / t0511-c21-pseud-link-02-e-expected.txt

diff --git a/LayoutTests/platform/efl/css2.1/t0511-c21-pseud-link-02-e-expected.txt b/LayoutTests/platform/efl/css2.1/t0511-c21-pseud-link-02-e-expected.txt
index 8af03ac..a35f4f6 100755 (executable)
--- a/LayoutTests/platform/efl/css2.1/t0511-c21-pseud-link-02-e-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0511-c21-pseud-link-02-e-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x38
   RenderBlock {HTML} at (0,0) size 800x38
     RenderBody {BODY} at (8,12) size 784x14
@@ -9,3 +10,14 @@ layer at (0,0) size 800x38
             text run at (0,0) width 123: "This link should be green."
         RenderText {#text} at (123,0) size 164x14
           text run at (123,0) width 164: " (do not hover over it or activate it)"
+=======
+layer at (0,0) size 800x51
+  RenderBlock {HTML} at (0,0) size 800x51
+    RenderBody {BODY} at (8,16) size 784x19
+      RenderBlock {P} at (0,0) size 784x19
+        RenderInline {A} at (0,0) size 164x19 [color=#008000]
+          RenderText {#text} at (0,0) size 164x19
+            text run at (0,0) width 164: "This link should be green."
+        RenderText {#text} at (164,0) size 219x19
+          text run at (164,0) width 219: " (do not hover over it or activate it)"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d