X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=LayoutTests%2Fplatform%2Fefl%2Ffast%2Frepaint%2Fbox-shadow-dynamic-expected.txt;h=9498ca5a603e08db482f0452d17b3855f070c822;hb=b96e33af77ac7d81a666d5aa202235b793aeeb21;hp=c6515ef7e906fc196e0b4d464180f8e6d6b77938;hpb=2632619e54bc9f41ccea7c574710fe213e49212d;p=framework%2Fweb%2Fwebkit-efl.git

diff --git a/LayoutTests/platform/efl/fast/repaint/box-shadow-dynamic-expected.txt b/LayoutTests/platform/efl/fast/repaint/box-shadow-dynamic-expected.txt
index c6515ef..9498ca5 100755
--- a/LayoutTests/platform/efl/fast/repaint/box-shadow-dynamic-expected.txt
+++ b/LayoutTests/platform/efl/fast/repaint/box-shadow-dynamic-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x286
   RenderBlock {HTML} at (0,0) size 800x286
     RenderBody {BODY} at (8,12) size 784x266
@@ -10,5 +11,17 @@ layer at (0,0) size 800x286
         RenderBlock {DIV} at (10,20) size 50x50 [bgcolor=#FFFF77]
           RenderBlock {DIV} at (10,0) size 30x50
       RenderBlock {DIV} at (0,146) size 70x120
+=======
+layer at (0,0) size 800x299
+  RenderBlock {HTML} at (0,0) size 800x299
+    RenderBody {BODY} at (8,16) size 784x275
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 382x19
+          text run at (0,0) width 382: "Tests the repainting of box shadows when boxes are resized."
+      RenderBlock {DIV} at (0,35) size 70x120
+        RenderBlock {DIV} at (10,20) size 50x50 [bgcolor=#FFFF77]
+          RenderBlock {DIV} at (10,0) size 30x50
+      RenderBlock {DIV} at (0,155) size 70x120
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
         RenderBlock {DIV} at (10,20) size 50x50 [bgcolor=#FFFF77]
           RenderBlock {DIV} at (10,0) size 30x50