tizen beta release

[profile/ivi/webkit-efl.git] / LayoutTests / platform / efl / fast / css / fieldset-display-row-expected.txt

diff --git a/LayoutTests/platform/efl/fast/css/fieldset-display-row-expected.txt b/LayoutTests/platform/efl/fast/css/fieldset-display-row-expected.txt
index fcbcc15..48cc42e 100755 (executable)
--- a/LayoutTests/platform/efl/fast/css/fieldset-display-row-expected.txt
+++ b/LayoutTests/platform/efl/fast/css/fieldset-display-row-expected.txt
@@ -3,6 +3,12 @@ layer at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
+<<<<<<< HEAD
       RenderFieldSet {FIELDSET} at (2,0) size 780x29 [border: (2px groove #C0C0C0)]
         RenderText {#text} at (11,6) size 282x14
           text run at (11,6) width 282: "If you can see this fieldset without crashing, then all is well."
+=======
+      RenderFieldSet {FIELDSET} at (2,0) size 780x38 [border: (2px groove #C0C0C0)]
+        RenderText {#text} at (14,7) size 375x19
+          text run at (14,7) width 375: "If you can see this fieldset without crashing, then all is well."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d