tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / images / pixel-crack-image-background-webkit-transform-scale-expected.txt

diff --git a/LayoutTests/platform/efl/fast/images/pixel-crack-image-background-webkit-transform-scale-expected.txt b/LayoutTests/platform/efl/fast/images/pixel-crack-image-background-webkit-transform-scale-expected.txt
index 897ff68..479c662 100755 (executable)
--- a/LayoutTests/platform/efl/fast/images/pixel-crack-image-background-webkit-transform-scale-expected.txt
+++ b/LayoutTests/platform/efl/fast/images/pixel-crack-image-background-webkit-transform-scale-expected.txt
@@ -2,11 +2,19 @@ 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 784x580
       RenderBlock {P} at (0,0) size 784x14
         RenderText {#text} at (0,0) size 552x14
           text run at (0,0) width 323: "Test pixel cracks when background sprite is transformed with scale. "
           text run at (323,0) width 229: "Need to run pixel test to verify if it is successful."
+=======
+    RenderBody {BODY} at (8,8) size 784x576
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 733x19
+          text run at (0,0) width 430: "Test pixel cracks when background sprite is transformed with scale. "
+          text run at (430,0) width 303: "Need to run pixel test to verify if it is successful."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
 layer at (12,72) size 16x16
   RenderBlock (positioned) {DIV} at (12,72) size 16x16
 layer at (24,72) size 16x16