tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / xsl / xslt-enc16to16-expected.txt

diff --git a/LayoutTests/platform/efl/fast/xsl/xslt-enc16to16-expected.txt b/LayoutTests/platform/efl/fast/xsl/xslt-enc16to16-expected.txt
index 6920f25..2932b3b 100755 (executable)
--- a/LayoutTests/platform/efl/fast/xsl/xslt-enc16to16-expected.txt
+++ b/LayoutTests/platform/efl/fast/xsl/xslt-enc16to16-expected.txt
@@ -3,9 +3,18 @@ layer at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
+<<<<<<< HEAD
       RenderText {#text} at (0,0) size 193x14
         text run at (0,0) width 193: "CHARACTERS IN XSLT: \x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9} "
       RenderBR {BR} at (193,11) size 0x0
       RenderBR {BR} at (0,14) size 0x14
       RenderText {#text} at (0,28) size 229x14
         text run at (0,28) width 229: "SOURCE XML: \x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}"
+=======
+      RenderText {#text} at (0,0) size 264x19
+        text run at (0,0) width 264: "CHARACTERS IN XSLT: \x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9} "
+      RenderBR {BR} at (264,15) size 0x0
+      RenderBR {BR} at (0,19) size 0x19
+      RenderText {#text} at (0,38) size 316x19
+        text run at (0,38) width 316: "SOURCE XML: \x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}\x{E9}"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d