update

dd1b0e3c · 智勇 · e4f4b768 · dd1b0e3c
Commit dd1b0e3c authored Dec 04, 2017 by 智勇
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

db_gen_config.sh db-utils/db_gen_config.sh +0 -1

No files found.
--- a/db-utils/db_gen_config.sh
+++ b/db-utils/db_gen_config.sh
@@ -74,7 +74,6 @@ elif [[  $database_name = 'qinqiong'  ]]; then
 	port='3310'
 elif [[  $database_name = 'cash_loan_flow'  ]]; then
 	# qinqiong
-<<<<<<< HEAD
 	sys_table_list='order_callback callback_configuration channel_configuration'
 	source_db_host='192.168.4.80'
 	port='8001'