X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=LayoutTests%2Fplatform%2Fefl%2Fcss2.1%2Ft090501-c414-flt-01-b-expected.txt;h=42bb4497fa3916b568c79a2966b7016048aba718;hb=b96e33af77ac7d81a666d5aa202235b793aeeb21;hp=ff62895a521e8e5cb3d56df8389ed89e020b21ef;hpb=2632619e54bc9f41ccea7c574710fe213e49212d;p=framework%2Fweb%2Fwebkit-efl.git

diff --git a/LayoutTests/platform/efl/css2.1/t090501-c414-flt-01-b-expected.txt b/LayoutTests/platform/efl/css2.1/t090501-c414-flt-01-b-expected.txt
index ff62895..42bb449 100755
--- a/LayoutTests/platform/efl/css2.1/t090501-c414-flt-01-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t090501-c414-flt-01-b-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x90
   RenderBlock {HTML} at (0,0) size 800x90
     RenderBody {BODY} at (8,12) size 784x66
@@ -20,3 +21,26 @@ layer at (0,0) size 800x90
             text run at (138,6) width 426: "Teal rectangle. Teal rectangle. Teal rectangle. Teal rectangle. Teal rectangle. Teal rectangle. "
             text run at (564,6) width 20: "Teal"
             text run at (138,20) width 400: "rectangle. Teal rectangle. Teal rectangle. Teal rectangle. Teal rectangle. Teal rectangle."
+=======
+layer at (0,0) size 800x140
+  RenderBlock {HTML} at (0,0) size 800x140
+    RenderBody {BODY} at (8,16) size 784x108
+      RenderBlock {P} at (0,0) size 784x19 [color=#000080]
+        RenderText {#text} at (0,0) size 542x19
+          text run at (0,0) width 542: "In the following test, the blue blocks should be on the given sides of the teal rectangle."
+      RenderBlock {DIV} at (0,35) size 784x73
+        RenderBlock {DIV} at (16,0) size 752x73 [color=#00FFFF] [bgcolor=#008080]
+          RenderBlock (floating) {P} at (8,8) size 176x54 [color=#FFFFFF] [bgcolor=#000080] [border: (4px solid #0000FF)]
+            RenderText {#text} at (8,8) size 132x38
+              text run at (8,8) width 115: "\x{21E6} This blue block"
+              text run at (8,27) width 132: "should be on the left."
+          RenderBlock (floating) {P} at (568,8) size 176x54 [color=#FFFFFF] [bgcolor=#000080] [border: (4px solid #0000FF)]
+            RenderText {#text} at (8,8) size 141x38
+              text run at (8,8) width 115: "\x{21E8} This blue block"
+              text run at (8,27) width 141: "should be on the right."
+          RenderText {#text} at (184,8) size 384x57
+            text run at (184,8) width 384: "Teal rectangle. Teal rectangle. Teal rectangle. Teal rectangle."
+            text run at (184,27) width 194: "Teal rectangle. Teal rectangle. "
+            text run at (378,27) width 190: "Teal rectangle. Teal rectangle."
+            text run at (184,46) width 384: "Teal rectangle. Teal rectangle. Teal rectangle. Teal rectangle."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d