tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / css2.1 / t0805-c5512-brdr-rw-02-b-expected.txt

diff --git a/LayoutTests/platform/efl/css2.1/t0805-c5512-brdr-rw-02-b-expected.txt b/LayoutTests/platform/efl/css2.1/t0805-c5512-brdr-rw-02-b-expected.txt
index b1f4208..591a8f0 100755 (executable)
--- a/LayoutTests/platform/efl/css2.1/t0805-c5512-brdr-rw-02-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0805-c5512-brdr-rw-02-b-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x64
   RenderBlock {HTML} at (0,0) size 800x64
     RenderBody {BODY} at (8,12) size 784x40
@@ -9,3 +10,14 @@ layer at (0,0) size 800x64
       RenderBlock {P} at (0,26) size 784x14 [color=#FF0000]
         RenderText {#text} at (0,0) size 3x14
           text run at (0,0) width 3: " "
+=======
+layer at (0,0) size 800x86
+  RenderBlock {HTML} at (0,0) size 800x86
+    RenderBody {BODY} at (8,16) size 784x54
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 230x19
+          text run at (0,0) width 230: "There should be no red on this page:"
+      RenderBlock {P} at (0,35) size 784x19 [color=#FF0000]
+        RenderText {#text} at (0,0) size 4x19
+          text run at (0,0) width 4: " "
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d