tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / events / event-listener-on-link-expected.txt

diff --git a/LayoutTests/platform/efl/fast/events/event-listener-on-link-expected.txt b/LayoutTests/platform/efl/fast/events/event-listener-on-link-expected.txt
index faf49b6..6061df4 100755 (executable)
--- a/LayoutTests/platform/efl/fast/events/event-listener-on-link-expected.txt
+++ b/LayoutTests/platform/efl/fast/events/event-listener-on-link-expected.txt
@@ -3,5 +3,11 @@ 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
       RenderText {#text} at (0,0) size 659x14
         text run at (0,0) width 659: "This tests that you can successfully add a DOMSubtreeModified event listener to a link element, and the page should load without crashing."
+=======
+      RenderText {#text} at (0,0) size 766x38
+        text run at (0,0) width 766: "This tests that you can successfully add a DOMSubtreeModified event listener to a link element, and the page should load"
+        text run at (0,19) width 109: "without crashing."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d