tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / css2.1 / 20110323 / inline-block-replaced-height-001-expected.txt

diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-001-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-001-expected.txt
index 16fd5db..c418efc 100755 (executable)
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-001-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-001-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x67
   RenderBlock {HTML} at (0,0) size 800x67
     RenderBody {BODY} at (8,12) size 784x47
@@ -7,5 +8,14 @@ layer at (0,0) size 800x67
         RenderText {#text} at (0,0) size 409x14
           text run at (0,0) width 409: "Test passes if there is no white space between the blue box below and the orange lines."
       RenderBlock {DIV} at (0,26) size 96x21 [border: (3px solid #FFA500) none (3px solid #FFA500) none]
+=======
+layer at (0,0) size 800x80
+  RenderBlock {HTML} at (0,0) size 800x80
+    RenderBody {BODY} at (8,16) size 784x56
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 547x19
+          text run at (0,0) width 547: "Test passes if there is no white space between the blue box below and the orange lines."
+      RenderBlock {DIV} at (0,35) size 96x21 [border: (3px solid #FFA500) none (3px solid #FFA500) none]
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
         RenderImage {IMG} at (0,3) size 15x15
         RenderText {#text} at (0,0) size 0x0