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

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

diff --git a/src/lib/elm_plug.h b/src/lib/elm_plug.h
index fcafa27..ed79d85 100755 (executable)
--- a/src/lib/elm_plug.h
+++ b/src/lib/elm_plug.h
@@ -1,21 +1,10 @@
 /**
  * @defgroup Plug Plug
+ * @ingroup Elementary
  *
-<<<<<<< HEAD
- *
- * An object that allows one to show an image which other process created. 
- * It can be used anywhere like any other elementary widget.
- *
- * This widget provides the limited functionality because this widget usually used to show socket's image. 
- *
- * If more functionality is needed, it will be added. 
- *
- *
-=======
- * An object that allows one to show an image which other process created. 
+ * An object that allows one to show an image which other process created.
  * It can be used anywhere like any other elementary widget.
  *
->>>>>>> remotes/origin/upstream
  */
 
 /**
@@ -29,10 +18,6 @@
  * @param parent The parent object
  * @return The new plug image object or NULL if it cannot be created
  *
-<<<<<<< HEAD
- *
-=======
->>>>>>> remotes/origin/upstream
  * @ingroup Plug
  */
 EAPI Evas_Object    *elm_plug_add(Evas_Object *parent);
@@ -40,18 +25,6 @@ EAPI Evas_Object    *elm_plug_add(Evas_Object *parent);
 /**
  * Connect a plug widget to service provided by socket image.
  *
-<<<<<<< HEAD
- * @param ee_target The Ecore_Evas containing the canvas in which the new image object will live.
- * @param svcname The service name to connect to set up by the socket.
- * @param svcnum The service number to connect to (set up by socket).
- * @param svcsys Booleain to set if the service is a system one or not (set up by socket).
- * @return (@c EINA_TRUE = success, @c EINA_FALSE = error)
- *
- *
- * @ingroup Plug
- */
-
-=======
  * @param obj The Evas_Object where the new image object will live.
  * @param svcname The service name to connect to set up by the socket.
  * @param svcnum The service number to connect to (set up by socket).
@@ -60,7 +33,6 @@ EAPI Evas_Object    *elm_plug_add(Evas_Object *parent);
  *
  * @ingroup Plug
  */
->>>>>>> remotes/origin/upstream
 EAPI Eina_Bool       elm_plug_connect(Evas_Object *obj, const char *svcname, int svcnum, Eina_Bool svcsys);
 
 /**