tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / runin / 002-expected.txt

diff --git a/LayoutTests/platform/efl/fast/runin/002-expected.txt b/LayoutTests/platform/efl/fast/runin/002-expected.txt
index 0f66e2a..74b797a 100755 (executable)
--- a/LayoutTests/platform/efl/fast/runin/002-expected.txt
+++ b/LayoutTests/platform/efl/fast/runin/002-expected.txt
@@ -1,5 +1,6 @@
 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
@@ -13,3 +14,18 @@ layer at (0,0) size 800x38
                 text run at (25,0) width 3: ":"
           RenderText {#text} at (28,0) size 48x14
             text run at (28,0) width 48: "Definition"
+=======
+layer at (0,0) size 800x51
+  RenderBlock {HTML} at (0,0) size 800x51
+    RenderBody {BODY} at (8,16) size 784x19
+      RenderBlock {DL} at (0,0) size 784x19
+        RenderBlock {DD} at (40,0) size 744x19
+          RenderInline (run-in) {DT} at (0,0) size 38x19
+            RenderText {#text} at (0,0) size 34x19
+              text run at (0,0) width 34: "Term"
+            RenderInline (generated) at (0,0) size 4x19
+              RenderText at (34,0) size 4x19
+                text run at (34,0) width 4: ":"
+          RenderText {#text} at (38,0) size 64x19
+            text run at (38,0) width 64: "Definition"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d