tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / writing-mode / english-bt-text-expected.txt

diff --git a/LayoutTests/platform/efl/fast/writing-mode/english-bt-text-expected.txt b/LayoutTests/platform/efl/fast/writing-mode/english-bt-text-expected.txt
index 6665bc8..77984be 100755 (executable)
--- a/LayoutTests/platform/efl/fast/writing-mode/english-bt-text-expected.txt
+++ b/LayoutTests/platform/efl/fast/writing-mode/english-bt-text-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 784x504 [border: (2px solid #000000)]
+<<<<<<< HEAD
       RenderBlock {DIV} at (2,14) size 780x204 [border: (2px solid #800000)]
         RenderBlock (floating) {DIV} at (678,2) size 100x100 [bgcolor=#00FF00]
         RenderText {#text} at (2,2) size 398x14
@@ -11,3 +12,13 @@ layer at (0,0) size 800x600
         RenderBR {BR} at (400,5) size 0x0
         RenderText {#text} at (2,16) size 165x14
           text run at (2,16) width 165: "This line should also be horizontal."
+=======
+      RenderBlock {DIV} at (2,18) size 780x204 [border: (2px solid #800000)]
+        RenderBlock (floating) {DIV} at (678,2) size 100x100 [bgcolor=#00FF00]
+        RenderText {#text} at (2,2) size 531x19
+          text run at (2,2) width 300: "Here is some text in a horizontal-bt block flow. "
+          text run at (302,2) width 231: "The block direction is bottom-to-top."
+        RenderBR {BR} at (533,6) size 0x0
+        RenderText {#text} at (2,21) size 220x19
+          text run at (2,21) width 220: "This line should also be horizontal."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d