tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / text / whitespace / 030-expected.txt

diff --git a/LayoutTests/platform/efl/fast/text/whitespace/030-expected.txt b/LayoutTests/platform/efl/fast/text/whitespace/030-expected.txt
index 86d1d99..c71fbab 100755 (executable)
--- a/LayoutTests/platform/efl/fast/text/whitespace/030-expected.txt
+++ b/LayoutTests/platform/efl/fast/text/whitespace/030-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x75
   RenderBlock {HTML} at (0,0) size 800x75
     RenderBody {BODY} at (8,10) size 784x57
@@ -12,3 +13,17 @@ layer at (0,0) size 800x75
           text run at (2,2) width 0: " "
           text run at (2,16) width 569: "This div is two lines.  The newline right after the tag opened is significant and is honored by Firefox and Opera (and us)."
           text run at (571,16) width 0: " "
+=======
+layer at (0,0) size 800x95
+  RenderBlock {HTML} at (0,0) size 800x95
+    RenderBody {BODY} at (8,13) size 784x74
+      RenderBlock {PRE} at (0,0) size 784x19 [border: (2px solid #008000)]
+        RenderText {#text} at (2,2) size 136x15
+          text run at (2,2) width 136: "I am on one line."
+          text run at (138,2) width 0: " "
+      RenderBlock {DIV} at (0,32) size 784x42 [border: (2px solid #008000)]
+        RenderText {#text} at (2,2) size 758x38
+          text run at (2,2) width 0: " "
+          text run at (2,21) width 758: "This div is two lines.  The newline right after the tag opened is significant and is honored by Firefox and Opera (and us)."
+          text run at (760,21) width 0: " "
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d