X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=LayoutTests%2Fplatform%2Fefl%2Ffast%2Ftext%2Finternational%2F002-expected.txt;h=7f99996d04cdcd4b53066f881c9451fbfd47ff8f;hb=b96e33af77ac7d81a666d5aa202235b793aeeb21;hp=d85e6d910f1347e60f0f61674a59dc4d614307bf;hpb=2632619e54bc9f41ccea7c574710fe213e49212d;p=framework%2Fweb%2Fwebkit-efl.git

diff --git a/LayoutTests/platform/efl/fast/text/international/002-expected.txt b/LayoutTests/platform/efl/fast/text/international/002-expected.txt
index d85e6d9..7f99996 100755
--- a/LayoutTests/platform/efl/fast/text/international/002-expected.txt
+++ b/LayoutTests/platform/efl/fast/text/international/002-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 784x584
+<<<<<<< HEAD
       RenderTable {TABLE} at (0,0) size 280x42
         RenderTableSection {TBODY} at (0,0) size 280x42
           RenderTableRow {TR} at (0,0) size 280x42
@@ -12,3 +13,15 @@ layer at (0,0) size 800x600
                 text run at (0,14) width 30: "\x{307E}\x{3059}\x{3002} "
                 text run at (30,14) width 245: "\x{3042}\x{306A}\x{305F}\x{306E}\x{610F}\x{56F3}\x{3057}\x{305F}\x{3068}\x{304A}\x{308A}\x{306B}\x{60C5}\x{5831}\x{3092}\x{4F1D}\x{3048}\x{308B}\x{3053}\x{3068}\x{304C}\x{3067}\x{304D}\x{307E}\x{3059}\x{3002}\x{3055}"
                 text run at (0,28) width 243: "\x{3089}\x{306B}\x{3001}\x{30D6}\x{30E9}\x{30A6}\x{30B6}\x{304B}\x{3089}\x{30B3}\x{30E1}\x{30F3}\x{30C8}\x{3084}\x{30DE}\x{30FC}\x{30AF}\x{30A2}\x{30C3}\x{30D7}\x{3092}\x{66F8}\x{304D}\x{8FBC}\x{3093}\x{3060}\x{308A}"
+=======
+      RenderTable {TABLE} at (0,0) size 280x76
+        RenderTableSection {TBODY} at (0,0) size 280x76
+          RenderTableRow {TR} at (0,0) size 280x76
+            RenderTableCell {TD} at (0,0) size 280x76 [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (0,0) size 280x76
+                text run at (0,0) width 278: "\x{8AB0}\x{3067}\x{3082}\x{3042}\x{306A}\x{305F}\x{306E}\x{30C9}\x{30AD}\x{30E5}\x{30E1}\x{30F3}\x{30C8}\x{3092}\x{30AA}\x{30EA}\x{30B8}\x{30CA}\x{30EB}\x{306E}\x{4F53}\x{88C1}\x{3067}\x{958B}\x{304F}\x{3053}\x{3068}"
+                text run at (0,19) width 64: "\x{304C}\x{3067}\x{304D}\x{307E}\x{3059}\x{3002} "
+                text run at (64,19) width 214: "\x{3042}\x{306A}\x{305F}\x{306E}\x{610F}\x{56F3}\x{3057}\x{305F}\x{3068}\x{304A}\x{308A}\x{306B}\x{60C5}\x{5831}\x{3092}\x{4F1D}\x{3048}\x{308B}\x{3053}\x{3068}\x{304C}"
+                text run at (0,38) width 280: "\x{3067}\x{304D}\x{307E}\x{3059}\x{3002}\x{3055}\x{3089}\x{306B}\x{3001}\x{30D6}\x{30E9}\x{30A6}\x{30B6}\x{304B}\x{3089}\x{30B3}\x{30E1}\x{30F3}\x{30C8}\x{3084}\x{30DE}\x{30FC}\x{30AF}\x{30A2}\x{30C3}\x{30D7}\x{3092}\x{66F8}"
+                text run at (0,57) width 50: "\x{304D}\x{8FBC}\x{3093}\x{3060}\x{308A}"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d