tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / css / namespaces / namespaces-empty-expected.txt

diff --git a/LayoutTests/platform/efl/fast/css/namespaces/namespaces-empty-expected.txt b/LayoutTests/platform/efl/fast/css/namespaces/namespaces-empty-expected.txt
index 404b397..d6a5c3c 100755 (executable)
--- a/LayoutTests/platform/efl/fast/css/namespaces/namespaces-empty-expected.txt
+++ b/LayoutTests/platform/efl/fast/css/namespaces/namespaces-empty-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x28
   RenderBlock {root} at (0,0) size 800x28
     RenderBlock {t} at (0,0) size 800x14 [bgcolor=#00FF00]
@@ -8,3 +9,13 @@ layer at (0,0) size 800x28
     RenderBlock {t} at (0,14) size 800x14 [bgcolor=#00FF00]
       RenderText {#text} at (0,0) size 223x14
         text run at (0,0) width 223: "This sentence should have a green background."
+=======
+layer at (0,0) size 800x38
+  RenderBlock {root} at (0,0) size 800x38
+    RenderBlock {t} at (0,0) size 800x19 [bgcolor=#00FF00]
+      RenderText {#text} at (0,0) size 299x19
+        text run at (0,0) width 299: "This sentence should have a green background."
+    RenderBlock {t} at (0,19) size 800x19 [bgcolor=#00FF00]
+      RenderText {#text} at (0,0) size 299x19
+        text run at (0,0) width 299: "This sentence should have a green background."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d