tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / css2.1 / t1001-abs-pos-cb-02-b-expected.txt

diff --git a/LayoutTests/platform/efl/css2.1/t1001-abs-pos-cb-02-b-expected.txt b/LayoutTests/platform/efl/css2.1/t1001-abs-pos-cb-02-b-expected.txt
index 661683d..3af0e23 100755 (executable)
--- a/LayoutTests/platform/efl/css2.1/t1001-abs-pos-cb-02-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1001-abs-pos-cb-02-b-expected.txt
@@ -5,5 +5,10 @@ layer at (0,0) size 800x100
     RenderBody {BODY} at (100,100) size 600x0 [bgcolor=#FF0000]
 layer at (0,0) size 800x600
   RenderBlock (positioned) {DIV} at (0,0) size 800x600 [color=#008000] [bgcolor=#FFFFFF]
+<<<<<<< HEAD
     RenderText {#text} at (0,0) size 172x14
       text run at (0,0) width 172: "There should be no red on this page."
+=======
+    RenderText {#text} at (0,0) size 230x19
+      text run at (0,0) width 230: "There should be no red on this page."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d