X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=LayoutTests%2Fplatform%2Fefl%2Ftables%2Fmozilla%2Fbugs%2Fbug83786-expected.txt;h=c7a4c7853a5dabc539641595f7e4d44e87ca0d44;hb=b96e33af77ac7d81a666d5aa202235b793aeeb21;hp=ffc0312d75f36244c9b56c18926a8d9011eac416;hpb=2632619e54bc9f41ccea7c574710fe213e49212d;p=framework%2Fweb%2Fwebkit-efl.git

diff --git a/LayoutTests/platform/efl/tables/mozilla/bugs/bug83786-expected.txt b/LayoutTests/platform/efl/tables/mozilla/bugs/bug83786-expected.txt
index ffc0312..c7a4c78 100755
--- a/LayoutTests/platform/efl/tables/mozilla/bugs/bug83786-expected.txt
+++ b/LayoutTests/platform/efl/tables/mozilla/bugs/bug83786-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x106
   RenderBlock {HTML} at (0,0) size 800x106
     RenderBody {BODY} at (0,0) size 800x106
@@ -23,4 +24,29 @@ layer at (0,0) size 206x106 clip at (3,3) size 200x100 scrollHeight 111
             RenderInline {SPAN} at (0,0) size 40x11 [color=#FFFF00] [bgcolor=#FF0000]
               RenderText {#text} at (0,100) size 40x11
                 text run at (0,100) width 40: "_FAIL!__"
+=======
+layer at (0,0) size 800x136
+  RenderBlock {HTML} at (0,0) size 800x136
+    RenderBody {BODY} at (0,0) size 800x136
+layer at (0,0) size 266x136 clip at (3,3) size 260x130 scrollHeight 144
+  RenderBlock {DIV} at (0,0) size 266x136 [border: (3px solid #008000)]
+    RenderTable {TABLE} at (16,3) size 64x143
+      RenderTableSection {TBODY} at (0,0) size 64x143
+        RenderTableRow {TR} at (0,0) size 64x143
+          RenderTableCell {TD} at (0,0) size 64x143 [r=0 c=0 rs=1 cs=1]
+            RenderText {#text} at (0,-1) size 64x132
+              text run at (0,-1) width 64: "This____"
+              text run at (0,12) width 64: "text____"
+              text run at (0,25) width 64: "should__"
+              text run at (0,38) width 64: "be______"
+              text run at (0,51) width 64: "wrapped,"
+              text run at (0,64) width 64: "one_____"
+              text run at (0,77) width 64: "word____"
+              text run at (0,90) width 64: "to______"
+              text run at (0,103) width 64: "a_______"
+              text run at (0,116) width 64: "line.___"
+            RenderInline {SPAN} at (0,0) size 56x14 [color=#FFFF00] [bgcolor=#FF0000]
+              RenderText {#text} at (0,130) size 56x14
+                text run at (0,130) width 56: "_FAIL!__"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
             RenderText {#text} at (0,0) size 0x0