tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / box-shadow / scaled-box-shadow-expected.txt

diff --git a/LayoutTests/platform/efl/fast/box-shadow/scaled-box-shadow-expected.txt b/LayoutTests/platform/efl/fast/box-shadow/scaled-box-shadow-expected.txt
index b323f73..5ea4db6 100755 (executable)
--- a/LayoutTests/platform/efl/fast/box-shadow/scaled-box-shadow-expected.txt
+++ b/LayoutTests/platform/efl/fast/box-shadow/scaled-box-shadow-expected.txt
@@ -5,6 +5,7 @@ layer at (0,0) size 800x592
     RenderBody {BODY} at (8,8) size 784x576
       RenderBlock {DIV} at (4,4) size 280x280
         RenderText {#text} at (0,0) size 0x0
+<<<<<<< HEAD
       RenderText {#text} at (288,133) size 3x14
         text run at (288,133) width 3: " "
       RenderBlock {DIV} at (295,4) size 280x280
@@ -17,13 +18,35 @@ layer at (0,0) size 800x592
       RenderText {#text} at (288,421) size 3x14
         text run at (288,421) width 3: " "
       RenderBlock {DIV} at (295,292) size 280x280
+=======
+      RenderText {#text} at (288,129) size 4x19
+        text run at (288,129) width 4: " "
+      RenderBlock {DIV} at (296,4) size 280x280
+        RenderText {#text} at (0,0) size 0x0
+      RenderText {#text} at (580,129) size 4x19
+        text run at (580,129) width 4: " "
+      RenderBR {BR} at (0,0) size 0x0
+      RenderBlock {DIV} at (4,292) size 280x280
+        RenderText {#text} at (0,0) size 0x0
+      RenderText {#text} at (288,417) size 4x19
+        text run at (288,417) width 4: " "
+      RenderBlock {DIV} at (296,292) size 280x280
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
         RenderText {#text} at (0,0) size 0x0
       RenderText {#text} at (0,0) size 0x0
 layer at (52,52) size 100x100
   RenderBlock (relative positioned) {DIV} at (40,40) size 100x100
+<<<<<<< HEAD
 layer at (343,52) size 100x100
   RenderBlock (relative positioned) {DIV} at (40,40) size 100x100
 layer at (52,340) size 100x100
   RenderBlock (relative positioned) {DIV} at (40,40) size 100x100
 layer at (343,340) size 100x100
+=======
+layer at (344,52) size 100x100
+  RenderBlock (relative positioned) {DIV} at (40,40) size 100x100
+layer at (52,340) size 100x100
+  RenderBlock (relative positioned) {DIV} at (40,40) size 100x100
+layer at (344,340) size 100x100
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
   RenderBlock (relative positioned) {DIV} at (40,40) size 100x100