tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / dom / xhtml / level3 / core / nodegetbaseuri05-expected.txt

diff --git a/LayoutTests/platform/efl/dom/xhtml/level3/core/nodegetbaseuri05-expected.txt b/LayoutTests/platform/efl/dom/xhtml/level3/core/nodegetbaseuri05-expected.txt
index 3a877e9..69052c0 100755 (executable)
--- a/LayoutTests/platform/efl/dom/xhtml/level3/core/nodegetbaseuri05-expected.txt
+++ b/LayoutTests/platform/efl/dom/xhtml/level3/core/nodegetbaseuri05-expected.txt
@@ -1,8 +1,17 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x38
   RenderBlock {html} at (0,0) size 800x38
     RenderBody {body} at (8,12) size 784x14
       RenderBlock {p} at (0,0) size 784x14
         RenderText {#text} at (0,0) size 15x14
           text run at (0,0) width 15: "bar"
+=======
+layer at (0,0) size 800x51
+  RenderBlock {html} at (0,0) size 800x51
+    RenderBody {body} at (8,16) size 784x19
+      RenderBlock {p} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 20x19
+          text run at (0,0) width 20: "bar"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d