tizen beta release

[profile/ivi/webkit-efl.git] / LayoutTests / platform / efl / fast / gradients / simple-gradients-expected.txt

diff --git a/LayoutTests/platform/efl/fast/gradients/simple-gradients-expected.txt b/LayoutTests/platform/efl/fast/gradients/simple-gradients-expected.txt
index aed1421..afd8f09 100755 (executable)
--- a/LayoutTests/platform/efl/fast/gradients/simple-gradients-expected.txt
+++ b/LayoutTests/platform/efl/fast/gradients/simple-gradients-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 {H1} at (0,0) size 784x28
         RenderText {#text} at (0,1) size 265x26
           text run at (0,1) width 265: "Radial Gradient Example"
@@ -11,3 +12,13 @@ layer at (0,0) size 800x600
         RenderText {#text} at (0,1) size 267x26
           text run at (0,1) width 267: "Linear Gradient Example"
       RenderBlock {DIV} at (0,258) size 154x154 [border: (2px solid #000000)]
+=======
+      RenderBlock {H1} at (0,0) size 784x37
+        RenderText {#text} at (0,0) size 353x36
+          text run at (0,0) width 353: "Radial Gradient Example"
+      RenderBlock {DIV} at (0,58) size 154x154 [border: (2px solid #000000)]
+      RenderBlock {H1} at (0,233) size 784x37
+        RenderText {#text} at (0,0) size 354x36
+          text run at (0,0) width 354: "Linear Gradient Example"
+      RenderBlock {DIV} at (0,291) size 154x154 [border: (2px solid #000000)]
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d