tizen beta release

[profile/ivi/webkit-efl.git] / LayoutTests / platform / efl / css2.1 / t0402-syntax-05-f-expected.txt

diff --git a/LayoutTests/platform/efl/css2.1/t0402-syntax-05-f-expected.txt b/LayoutTests/platform/efl/css2.1/t0402-syntax-05-f-expected.txt
index 377f106..86f9369 100755 (executable)
--- a/LayoutTests/platform/efl/css2.1/t0402-syntax-05-f-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0402-syntax-05-f-expected.txt
@@ -1,8 +1,17 @@
 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
       RenderBlock {P} at (0,0) size 784x14 [color=#008000]
         RenderText {#text} at (0,0) size 119x14
           text run at (0,0) width 119: "This text should be green"
+=======
+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 [color=#008000]
+        RenderText {#text} at (0,0) size 159x19
+          text run at (0,0) width 159: "This text should be green"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d