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

diff --git a/LayoutTests/platform/efl/tables/mozilla_expected_failures/bugs/bug17826-expected.txt b/LayoutTests/platform/efl/tables/mozilla_expected_failures/bugs/bug17826-expected.txt
index 424a917..b20cd38 100755
--- a/LayoutTests/platform/efl/tables/mozilla_expected_failures/bugs/bug17826-expected.txt
+++ b/LayoutTests/platform/efl/tables/mozilla_expected_failures/bugs/bug17826-expected.txt
@@ -2,6 +2,7 @@ layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
+<<<<<<< HEAD
     RenderBody {BODY} at (8,8) size 784x580
       RenderTable {TABLE} at (0,0) size 784x64 [bgcolor=#CCCCCC] [border: (1px solid #FF0000)]
         RenderTableSection {TBODY} at (1,1) size 782x62
@@ -36,3 +37,39 @@ layer at (0,0) size 800x600
         RenderText {#text} at (0,0) size 745x28
           text run at (0,0) width 745: "bug #17826 : Drag the right edge of the window and either widen or narrow the window; the column widths should oscillate as you resize the window (tested"
           text run at (0,14) width 103: "1999122008 WinNT)"
+=======
+    RenderBody {BODY} at (8,8) size 784x576
+      RenderTable {TABLE} at (0,0) size 784x79 [bgcolor=#CCCCCC] [border: (1px solid #FF0000)]
+        RenderTableSection {TBODY} at (1,1) size 782x77
+          RenderTableRow {TR} at (0,2) size 782x23
+            RenderTableCell {TD} at (2,2) size 147x23 [border: (1px solid #FF0000)] [r=0 c=0 rs=2 cs=1]
+              RenderText {#text} at (2,2) size 4x19
+                text run at (2,2) width 4: " "
+            RenderTableCell {TD} at (151,2) size 328x23 [border: (1px solid #FF0000)] [r=0 c=1 rs=1 cs=6]
+              RenderText {#text} at (2,2) size 4x19
+                text run at (2,2) width 4: " "
+            RenderTableCell {TD} at (481,2) size 149x23 [border: (1px solid #FF0000)] [r=0 c=7 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 4x19
+                text run at (2,2) width 4: " "
+            RenderTableCell {TD} at (632,2) size 148x23 [border: (1px solid #FF0000)] [r=0 c=8 rs=2 cs=1]
+              RenderText {#text} at (2,2) size 4x19
+                text run at (2,2) width 4: " "
+          RenderTableRow {TR} at (0,27) size 782x23
+            RenderTableCell {TD} at (151,27) size 174x23 [border: (1px solid #FF0000)] [r=1 c=1 rs=1 cs=3]
+              RenderText {#text} at (2,2) size 100x19
+                text run at (2,2) width 100: "Find a Business"
+            RenderTableCell {TD} at (327,27) size 152x23 [border: (1px solid #FF0000)] [r=1 c=4 rs=1 cs=3]
+              RenderText {#text} at (2,2) size 78x19
+                text run at (2,2) width 78: "What's New"
+            RenderTableCell {TD} at (481,27) size 149x23 [border: (1px solid #FF0000)] [r=1 c=7 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 75x19
+                text run at (2,2) width 75: "Search Tips"
+          RenderTableRow {TR} at (0,52) size 782x23
+            RenderTableCell {TD} at (2,52) size 778x23 [border: (1px solid #FF0000)] [r=2 c=0 rs=1 cs=9]
+              RenderText {#text} at (2,2) size 4x19
+                text run at (2,2) width 4: " "
+      RenderBlock {P} at (0,95) size 784x38
+        RenderText {#text} at (0,0) size 730x38
+          text run at (0,0) width 730: "bug #17826 : Drag the right edge of the window and either widen or narrow the window; the column widths should"
+          text run at (0,19) width 402: "oscillate as you resize the window (tested 1999122008 WinNT)"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d