tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / forms / select-selected-expected.txt

diff --git a/LayoutTests/platform/efl/fast/forms/select-selected-expected.txt b/LayoutTests/platform/efl/fast/forms/select-selected-expected.txt
index 23745a3..5658456 100755 (executable)
--- a/LayoutTests/platform/efl/fast/forms/select-selected-expected.txt
+++ b/LayoutTests/platform/efl/fast/forms/select-selected-expected.txt
@@ -3,8 +3,14 @@ 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
       RenderMenuList {SELECT} at (2,2) size 361x38 [color=#202020]
         RenderBlock (anonymous) at (15,10) size 305x18
           RenderText at (0,0) size 219x17
+=======
+      RenderMenuList {SELECT} at (2,2) size 361x39 [color=#202020]
+        RenderBlock (anonymous) at (15,10) size 305x19
+          RenderText at (0,0) size 219x19
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
             text run at (0,0) width 219: "should see this option selected"
       RenderText {#text} at (0,0) size 0x0