[lng-odp] [API-NEXT PATCH 07/15] merge fix: odp_init.c

[Maxim Uvarov]

Signed-off-by: Maxim Uvarov <maxim.uva...@linaro.org>
---
 platform/linux-generic/odp_init.c | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/platform/linux-generic/odp_init.c 
b/platform/linux-generic/odp_init.c
index 94e06319..2cd8fe3f 100644
--- a/platform/linux-generic/odp_init.c
+++ b/platform/linux-generic/odp_init.c
@@ -10,11 +10,8 @@
 #include <odp_internal.h>
 #include <odp_schedule_if.h>
 #include <string.h>
-<<<<<<< HEAD
 #include <libconfig.h>
 #include <stdlib.h>
-=======
->>>>>>> v1.13.0.0
 #include <stdio.h>
 #include <linux/limits.h>
 #include <dirent.h>
@@ -25,7 +22,6 @@
 
 #define _ODP_FILES_FMT "odp-%d-"
 #define _ODP_TMPDIR    "/tmp"
-<<<<<<< HEAD
 
 /* the name of the ODP configuration file: */
 #define CONFIGURATION_FILE_ENV_NONE "none"
@@ -35,8 +31,6 @@
 
 /* the ODP configuration file name can also be oveerwritten by env. variable: 
*/
 #define ODP_SYSCONFIG_FILE_ENV "ODP_SYSCONFIG_FILE"
-=======
->>>>>>> v1.13.0.0
 
 struct odp_global_data_s odp_global_data;
 
@@ -82,7 +76,6 @@ static int cleanup_files(const char *dirpath, int odp_pid)
        return 0;
 }
 
-<<<<<<< HEAD
 /* read the odp configuration file
  *
  * the configuration file is read from:
@@ -149,8 +142,6 @@ static int read_configfile(void)
        return 0;
 }
 
-=======
->>>>>>> v1.13.0.0
 int odp_init_global(odp_instance_t *instance,
                    const odp_init_t *params,
                    const odp_platform_init_t *platform_params ODP_UNUSED)
@@ -173,12 +164,9 @@ int odp_init_global(odp_instance_t *instance,
 
        cleanup_files(_ODP_TMPDIR, odp_global_data.main_pid);
 
-<<<<<<< HEAD
        if (read_configfile())
                goto init_failed;
 
-=======
->>>>>>> v1.13.0.0
        if (odp_cpumask_init_global(params)) {
                ODP_ERR("ODP cpumask init failed.\n");
                goto init_failed;
-- 
2.11.0.295.gd7dffce