X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=LayoutTests%2Fplatform%2Fefl%2Fdom%2Fxhtml%2Flevel3%2Fcore%2Fnodegetbaseuri05-expected.txt;h=69052c014acba827f9fd498cbaeaafee4c2f091d;hb=b96e33af77ac7d81a666d5aa202235b793aeeb21;hp=3a877e9ddcdf6992befc5a5979129e1350632fea;hpb=2632619e54bc9f41ccea7c574710fe213e49212d;p=framework%2Fweb%2Fwebkit-efl.git

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
--- 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