tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / invalid / 001-expected.txt

diff --git a/LayoutTests/platform/efl/fast/invalid/001-expected.txt b/LayoutTests/platform/efl/fast/invalid/001-expected.txt
index b56eda6..d2be5c9 100755 (executable)
--- a/LayoutTests/platform/efl/fast/invalid/001-expected.txt
+++ b/LayoutTests/platform/efl/fast/invalid/001-expected.txt
@@ -8,6 +8,7 @@ layer at (0,0) size 800x600
       RenderBlock (anonymous) at (0,0) size 784x0
       RenderBlock (anonymous) at (0,0) size 784x0
         RenderInline {B} at (0,0) size 0x0
+<<<<<<< HEAD
       RenderBlock {P} at (0,0) size 784x14
         RenderInline {B} at (0,0) size 27x14
           RenderText {#text} at (0,0) size 27x14
@@ -17,3 +18,14 @@ layer at (0,0) size 800x600
       RenderBlock (anonymous) at (0,26) size 784x14
         RenderText {#text} at (0,0) size 68x14
           text run at (0,0) width 68: "Also not bold."
+=======
+      RenderBlock {P} at (0,0) size 784x19
+        RenderInline {B} at (0,0) size 36x19
+          RenderText {#text} at (0,0) size 36x19
+            text run at (0,0) width 36: "Bold "
+        RenderText {#text} at (36,0) size 56x19
+          text run at (36,0) width 56: "Not bold"
+      RenderBlock (anonymous) at (0,35) size 784x19
+        RenderText {#text} at (0,0) size 90x19
+          text run at (0,0) width 90: "Also not bold."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d