Fixed the conflict merge

diff --cc email-core/email-storage/email-storage.c
index e556bfc,57b0826..9618f03
--- 1/email-core/email-storage/email-storage.c
--- 2/email-core/email-storage/email-storage.c
+++ b/email-core/email-storage/email-storage.c
@@@ -187,10 -187,10 +187,8 @@@
        }
  
  /*  for safety DB operation */
- static pthread_mutex_t _transactionBeginLock = PTHREAD_MUTEX_INITIALIZER;
- static pthread_mutex_t _transactionEndLock = PTHREAD_MUTEX_INITIALIZER;
  static pthread_mutex_t _db_handle_lock = PTHREAD_MUTEX_INITIALIZER;
  
 -static int _get_attribute_type_by_mail_field_name(char *input_mail_field_name, email_mail_attribute_type *output_mail_attribute_type);
 -
  #define       _MULTIPLE_DB_HANDLE
  
  #ifdef _MULTIPLE_DB_HANDLE

diff --cc utilities/test-application/testapp-others.c
Simple merge