tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / css / focus-ring-outline-color-expected.txt

diff --git a/LayoutTests/platform/efl/fast/css/focus-ring-outline-color-expected.txt b/LayoutTests/platform/efl/fast/css/focus-ring-outline-color-expected.txt
index abfbcbb..0941aa3 100755 (executable)
--- a/LayoutTests/platform/efl/fast/css/focus-ring-outline-color-expected.txt
+++ b/LayoutTests/platform/efl/fast/css/focus-ring-outline-color-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 {P} at (0,0) size 784x14
         RenderText {#text} at (0,0) size 634x14
           text run at (0,0) width 634: "Assuming the port-specific theme draws focus rings, this test can be used to ensure that a focus ring is drawn with green outline color."
@@ -10,4 +11,14 @@ layer at (0,0) size 800x600
         RenderInline {A} at (0,0) size 20x14 [color=#0000EE]
           RenderText {#text} at (0,0) size 20x14
             text run at (0,0) width 20: "Test"
+=======
+      RenderBlock {P} at (0,0) size 784x38
+        RenderText {#text} at (0,0) size 754x38
+          text run at (0,0) width 754: "Assuming the port-specific theme draws focus rings, this test can be used to ensure that a focus ring is drawn with green"
+          text run at (0,19) width 83: "outline color."
+      RenderBlock (anonymous) at (0,54) size 784x19
+        RenderInline {A} at (0,0) size 27x19 [color=#0000EE]
+          RenderText {#text} at (0,0) size 27x19
+            text run at (0,0) width 27: "Test"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
         RenderText {#text} at (0,0) size 0x0