X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=LayoutTests%2Fplatform%2Fefl%2Fcss2.1%2Ft170602-bdr-conflct-w-09-d-expected.txt;h=9514a66452fd38f514932f5055de717a6959e00e;hb=b96e33af77ac7d81a666d5aa202235b793aeeb21;hp=e588b772f735375565f5c748e70747a8682bfbb8;hpb=2632619e54bc9f41ccea7c574710fe213e49212d;p=framework%2Fweb%2Fwebkit-efl.git

diff --git a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-09-d-expected.txt b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-09-d-expected.txt
index e588b77..9514a66 100755
--- a/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-09-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t170602-bdr-conflct-w-09-d-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x160
   RenderBlock {HTML} at (0,0) size 800x160
     RenderBody {BODY} at (8,12) size 784x140
@@ -38,3 +39,43 @@ layer at (0,0) size 800x160
             RenderTableCell {TD} at (59,87) size 25x16 [r=2 c=2 rs=1 cs=1]
               RenderText {#text} at (1,1) size 23x14
                 text run at (1,1) width 23: "none"
+=======
+layer at (0,0) size 800x209
+  RenderBlock {HTML} at (0,0) size 800x209
+    RenderBody {BODY} at (8,16) size 784x185
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 317x19
+          text run at (0,0) width 317: "There should be no red borders on the table below"
+      RenderTable {TABLE} at (0,35) size 111x150
+        RenderTableSection {TBODY} at (0,0) size 111x150
+          RenderTableRow {TR} at (0,0) size 111x50
+            RenderTableCell {TD} at (0,14) size 33x21 [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 31x19
+                text run at (1,1) width 31: "none"
+            RenderTableCell {TD} at (33,14) size 45x21 [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 31x19
+                text run at (1,1) width 31: "none"
+            RenderTableCell {TD} at (78,14) size 33x21 [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 31x19
+                text run at (1,1) width 31: "none"
+          RenderTableRow {TR} at (0,50) size 111x50
+            RenderTableCell {TD} at (0,64) size 33x21 [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 31x19
+                text run at (1,1) width 31: "none"
+            RenderTableCell {TD} at (33,64) size 45x21 [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 43x19
+                text run at (1,1) width 43: "hidden"
+            RenderTableCell {TD} at (78,64) size 33x21 [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 31x19
+                text run at (1,1) width 31: "none"
+          RenderTableRow {TR} at (0,100) size 111x50
+            RenderTableCell {TD} at (0,114) size 33x21 [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 31x19
+                text run at (1,1) width 31: "none"
+            RenderTableCell {TD} at (33,114) size 45x21 [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 31x19
+                text run at (1,1) width 31: "none"
+            RenderTableCell {TD} at (78,114) size 33x21 [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 31x19
+                text run at (1,1) width 31: "none"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d