Removed smooth scrolling. Patch by Jiyoun Park <jy0703.park@samsung.com>

[framework/uifw/elementary.git] / src / lib / elm_need.h

diff --git a/src/lib/elm_need.h b/src/lib/elm_need.h
index 7600731..1e43269 100644 (file)
--- a/src/lib/elm_need.h
+++ b/src/lib/elm_need.h
@@ -1,9 +1,5 @@
 /**
-<<<<<<< HEAD
- * Request that your elementary application needs efreet
-=======
  * Request that your elementary application needs Efreet
->>>>>>> remotes/origin/upstream
  *
  * This initializes the Efreet library when called and if support exists
  * it returns EINA_TRUE, otherwise returns EINA_FALSE. This must be called