合并冲突

db/db_api/CDBConnPool.cpp

@@ -230,11 +230,7 @@ namespace YADB
 								{
 									Error = "Error,failed connect to database!";
 									//Connect failed, write log...
-<<<<<<< HEAD
-									log_errno("Error,failed connect to database,Err=%s" , Error.c_str());
-=======
 									log_error( "Error,failed connect to database,Err=%s\n", Error.c_str() );
->>>>>>> 669b9a37bf1f6e03a4a5da065a9002c59890202f
 									//如果连接失败了休息一下
 									boost::this_thread::sleep( boost::posix_time::milliseconds( 100 ) );
 								}