X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=LayoutTests%2Fplatform%2Fefl%2Ffast%2Foverflow%2F005-expected.txt;h=979450db550d78e85a8a4cfe377fd351d4e8a602;hb=b96e33af77ac7d81a666d5aa202235b793aeeb21;hp=021b6206af5b667ec411df11201ce8766508c2c7;hpb=2632619e54bc9f41ccea7c574710fe213e49212d;p=framework%2Fweb%2Fwebkit-efl.git

diff --git a/LayoutTests/platform/efl/fast/overflow/005-expected.txt b/LayoutTests/platform/efl/fast/overflow/005-expected.txt
index 021b620..979450d 100755
--- a/LayoutTests/platform/efl/fast/overflow/005-expected.txt
+++ b/LayoutTests/platform/efl/fast/overflow/005-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 784x582
 layer at (8,8) size 300x22
   RenderBlock {PRE} at (0,0) size 300x22
@@ -9,3 +10,12 @@ layer at (8,8) size 300x22
       text run at (0,0) width 234: "This is a test to see if this messes up"
       text run at (234,0) width 0: " "
       text run at (0,11) width 180: "the way I think it's going to."
+=======
+    RenderBody {BODY} at (8,8) size 784x579
+layer at (8,8) size 300x45 clip at (8,8) size 300x30 scrollWidth 312
+  RenderBlock {PRE} at (0,0) size 300x45
+    RenderText {#text} at (0,0) size 312x30
+      text run at (0,0) width 312: "This is a test to see if this messes up"
+      text run at (312,0) width 0: " "
+      text run at (0,15) width 240: "the way I think it's going to."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d