tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / parser / title-error-test-expected.txt

diff --git a/LayoutTests/platform/efl/fast/parser/title-error-test-expected.txt b/LayoutTests/platform/efl/fast/parser/title-error-test-expected.txt
index 01007bb..4594bc5 100755 (executable)
--- a/LayoutTests/platform/efl/fast/parser/title-error-test-expected.txt
+++ b/LayoutTests/platform/efl/fast/parser/title-error-test-expected.txt
@@ -2,11 +2,16 @@ 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
+=======
+    RenderBody {BODY} at (8,8) size 784x576
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
       RenderBlock (anonymous) at (0,0) size 784x0
         RenderInline {TIMER:TIME} at (0,0) size 0x0
           RenderText {#text} at (0,0) size 0x0
           RenderText {#text} at (0,0) size 0x0
+<<<<<<< HEAD
       RenderBlock (anonymous) at (0,0) size 784x14
         RenderBlock {P} at (0,0) size 784x14
           RenderInline {SPAN} at (0,0) size 56x14 [color=#008000]
@@ -15,5 +20,15 @@ layer at (0,0) size 800x600
           RenderText {#text} at (56,0) size 110x14
             text run at (56,0) width 110: " Content was displayed"
       RenderBlock (anonymous) at (0,26) size 784x0
+=======
+      RenderBlock (anonymous) at (0,0) size 784x19
+        RenderBlock {P} at (0,0) size 784x19
+          RenderInline {SPAN} at (0,0) size 75x19 [color=#008000]
+            RenderText {#text} at (0,0) size 75x19
+              text run at (0,0) width 75: "SUCCESS:"
+          RenderText {#text} at (75,0) size 147x19
+            text run at (75,0) width 147: " Content was displayed"
+      RenderBlock (anonymous) at (0,35) size 784x0
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
         RenderInline {TIMER:TIME} at (0,0) size 0x0
         RenderText {#text} at (0,0) size 0x0