tizen beta release

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

diff --git a/LayoutTests/platform/efl/fast/xsl/xslt-missing-namespace-in-xslt-expected.txt b/LayoutTests/platform/efl/fast/xsl/xslt-missing-namespace-in-xslt-expected.txt
index e987bc0..3932eb2 100755 (executable)
--- a/LayoutTests/platform/efl/fast/xsl/xslt-missing-namespace-in-xslt-expected.txt
+++ b/LayoutTests/platform/efl/fast/xsl/xslt-missing-namespace-in-xslt-expected.txt
@@ -2,6 +2,7 @@ CONSOLE MESSAGE: line 8: Namespace prefix foo on bar is not defined
 
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x64
   RenderBlock {html} at (0,0) size 800x64
     RenderBody {body} at (8,12) size 784x40
@@ -13,3 +14,16 @@ layer at (0,0) size 800x64
       RenderBlock {p} at (0,26) size 784x14
         RenderText {#text} at (0,0) size 261x14
           text run at (0,0) width 261: "ERROR? this, and nothing below it should be rendered"
+=======
+layer at (0,0) size 800x86
+  RenderBlock {html} at (0,0) size 800x86
+    RenderBody {body} at (8,16) size 784x54
+      RenderBlock {p} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 227x19
+          text run at (0,0) width 227: "You should see error text above this"
+      RenderBlock (anonymous) at (0,35) size 784x0
+        RenderInline {bar} at (0,0) size 0x0
+      RenderBlock {p} at (0,35) size 784x19
+        RenderText {#text} at (0,0) size 350x19
+          text run at (0,0) width 350: "ERROR? this, and nothing below it should be rendered"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d