Resolve the conflicts

diff --git a/src/bin/test_win_keygrab.c b/src/bin/test_win_keygrab.c
index b93ae0c203cc6958c9ba9eafba5a491e3356132d..9032e9fbb192410207c6d67566cf64bb0b116ac8 100644 (file)
--- a/src/bin/test_win_keygrab.c
+++ b/src/bin/test_win_keygrab.c
@@ -58,11 +58,7 @@ _entry_changed_cb(void *data , Evas_Object *obj, void *event_info EINA_UNUSED)
    api_data *api = data;
    const char *str = elm_entry_entry_get(obj);
    if (!str) return;
-<<<<<<< HEAD
-   strcpy(api->keyname, str);
-=======
    strncpy(api->keyname, str, PATH_MAX - 1);
->>>>>>> opensource/master
    printf("entry: %s\n",str);
 }