X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=LayoutTests%2Fplatform%2Fefl%2Ffast%2Fcss%2Fline-height-negative-expected.txt;h=8b3a1a916c60234b468a257dc78ab8d34308bd8b;hb=b96e33af77ac7d81a666d5aa202235b793aeeb21;hp=58e5699320eff80fc153f21f92764abf35f96494;hpb=2632619e54bc9f41ccea7c574710fe213e49212d;p=framework%2Fweb%2Fwebkit-efl.git

diff --git a/LayoutTests/platform/efl/fast/css/line-height-negative-expected.txt b/LayoutTests/platform/efl/fast/css/line-height-negative-expected.txt
index 58e5699..8b3a1a9 100755
--- a/LayoutTests/platform/efl/fast/css/line-height-negative-expected.txt
+++ b/LayoutTests/platform/efl/fast/css/line-height-negative-expected.txt
@@ -4,6 +4,7 @@ layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
       RenderBlock {DIV} at (0,0) size 784x10
+<<<<<<< HEAD
         RenderText {#text} at (0,0) size 225x11
           text run at (0,0) width 225: "This should be fairly small text, rather than huge."
 layer at (8,30) size 200x36
@@ -14,3 +15,15 @@ layer at (8,30) size 200x36
   RenderBlock (positioned) {SPAN} at (0,0) size 200x36 [bgcolor=#008000]
     RenderText {#text} at (0,11) size 132x14
       text run at (0,11) width 132: "There should be no red here"
+=======
+        RenderText {#text} at (0,-1) size 225x13
+          text run at (0,-1) width 225: "This should be fairly small text, rather than huge."
+layer at (8,34) size 200x48
+  RenderBlock (positioned) {DIV} at (8,34) size 200x48 [bgcolor=#FF0000]
+    RenderText {#text} at (0,14) size 4x19
+      text run at (0,14) width 4: " "
+layer at (8,34) size 200x48
+  RenderBlock (positioned) {SPAN} at (0,0) size 200x48 [bgcolor=#008000]
+    RenderText {#text} at (0,14) size 177x19
+      text run at (0,14) width 177: "There should be no red here"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d