tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / selectors / 177b-expected.txt

diff --git a/LayoutTests/platform/efl/fast/selectors/177b-expected.txt b/LayoutTests/platform/efl/fast/selectors/177b-expected.txt
index 8d7c43c..1af3ccf 100755 (executable)
--- a/LayoutTests/platform/efl/fast/selectors/177b-expected.txt
+++ b/LayoutTests/platform/efl/fast/selectors/177b-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
@@ -7,3 +8,12 @@ layer at (0,0) size 800x38
         RenderBlock {P} at (0,0) size 784x14
           RenderText {#text} at (0,0) size 122x14
             text run at (0,0) width 122: "This line should be green."
+=======
+layer at (0,0) size 800x51
+  RenderBlock {HTML} at (0,0) size 800x51
+    RenderBody {BODY} at (8,16) size 784x19
+      RenderBlock {DIV} at (0,0) size 784x19 [color=#008000]
+        RenderBlock {P} at (0,0) size 784x19
+          RenderText {#text} at (0,0) size 163x19
+            text run at (0,0) width 163: "This line should be green."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d