Merge remote-tracking branch 'remotes/origin/upstream'

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

diff --git a/src/lib/elm_app.h b/src/lib/elm_app.h
index 86dba27..9d7cceb 100644 (file)
--- a/src/lib/elm_app.h
+++ b/src/lib/elm_app.h
@@ -78,7 +78,11 @@ EAPI void        elm_app_info_set(void *mainfunc, const char *dom, const char *c
 
 /**
  * Provide information on the @b fallback application's binaries
+<<<<<<< HEAD
+ * directory, in scenarios where they get overriden by
+=======
  * directory, in scenarios where they get overridden by
+>>>>>>> remotes/origin/upstream
  * elm_app_info_set().
  *
  * @param dir The path to the default binaries directory (compile time
@@ -96,7 +100,11 @@ EAPI void        elm_app_compile_bin_dir_set(const char *dir);
 
 /**
  * Provide information on the @b fallback application's libraries
+<<<<<<< HEAD
+ * directory, on scenarios where they get overriden by
+=======
  * directory, on scenarios where they get overridden by
+>>>>>>> remotes/origin/upstream
  * elm_app_info_set().
  *
  * @param dir The path to the default libraries directory (compile
@@ -114,7 +122,11 @@ EAPI void        elm_app_compile_lib_dir_set(const char *dir);
 
 /**
  * Provide information on the @b fallback application's data
+<<<<<<< HEAD
+ * directory, on scenarios where they get overriden by
+=======
  * directory, on scenarios where they get overridden by
+>>>>>>> remotes/origin/upstream
  * elm_app_info_set().
  *
  * @param dir The path to the default data directory (compile time
@@ -132,7 +144,11 @@ EAPI void        elm_app_compile_data_dir_set(const char *dir);
 
 /**
  * Provide information on the @b fallback application's locale
+<<<<<<< HEAD
+ * directory, on scenarios where they get overriden by
+=======
  * directory, on scenarios where they get overridden by
+>>>>>>> remotes/origin/upstream
  * elm_app_info_set().
  *
  * @param dir The path to the default locale directory (compile time