Early merge - [EFL] Support for HTML media capture

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / Skipped

diff --git a/LayoutTests/platform/efl/Skipped b/LayoutTests/platform/efl/Skipped
index 89fc2a5..6059101 100644 (file)
--- a/LayoutTests/platform/efl/Skipped
+++ b/LayoutTests/platform/efl/Skipped
@@ -847,13 +847,11 @@ svg/as-image/image-respects-deviceScaleFactor.html
 # Skipped until new WebSocket protocol is implemented. http://webkit.org/b/50099
 http/tests/websocket/tests/hybi/
 
-<<<<<<< HEAD
 # Web Intents is not yet enabled.
 webintents/
-=======
+
 # Microdata DOM API is not yet enabled.
 fast/dom/MicroData
->>>>>>> 18e7d3f8b5a193b8304f1bae0f5ad6c29740aa1f
 
 # Pointer Lock is not implemented.
 pointer-lock/