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

diff --git a/LayoutTests/platform/efl/tables/mozilla/bugs/bug51140-expected.txt b/LayoutTests/platform/efl/tables/mozilla/bugs/bug51140-expected.txt
index e79df08..fdbf6bb 100755
--- a/LayoutTests/platform/efl/tables/mozilla/bugs/bug51140-expected.txt
+++ b/LayoutTests/platform/efl/tables/mozilla/bugs/bug51140-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
       RenderBlock (anonymous) at (0,0) size 784x14
         RenderInline {A} at (0,0) size 20x14 [color=#0000EE]
           RenderText {#text} at (0,0) size 20x14
@@ -23,3 +24,25 @@ layer at (8,22) size 15x14
   RenderBlock (positioned) {DIV} at (8,22) size 15x14
     RenderText {#text} at (0,0) size 15x14
       text run at (0,0) width 15: "div"
+=======
+      RenderBlock (anonymous) at (0,0) size 784x19
+        RenderInline {A} at (0,0) size 27x19 [color=#551A8B]
+          RenderText {#text} at (0,0) size 27x19
+            text run at (0,0) width 27: "note"
+        RenderText {#text} at (27,0) size 4x19
+          text run at (27,0) width 4: " "
+        RenderInline {A} at (0,0) size 72x19 [color=#551A8B]
+          RenderText {#text} at (31,0) size 72x19
+            text run at (31,0) width 72: "closepopup"
+        RenderText {#text} at (0,0) size 0x0
+      RenderTable {TABLE} at (0,19) size 40x29 [border: (1px outset #808080)]
+        RenderTableSection {TBODY} at (1,1) size 38x27
+          RenderTableRow {TR} at (0,2) size 38x23
+            RenderTableCell {TD} at (2,2) size 34x23 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 30x19
+                text run at (2,2) width 30: "table"
+layer at (8,27) size 20x19
+  RenderBlock (positioned) {DIV} at (8,27) size 20x19
+    RenderText {#text} at (0,0) size 20x19
+      text run at (0,0) width 20: "div"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d