hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed previous conflict line

Browse Source 
Removed previous conflict line
This commit is contained in:
MassimilianoPinto
2015-09-10 14:58:09 +02:00
parent c9fd82839b
commit db93d868f8
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
server/modules/include/blr.h
View File

@ -148,7 +148,6 @@
#define BLR_MASTER_BACKOFF_TIME 10 #define BLR_MASTER_BACKOFF_TIME 10
#define BLR_MAX_BACKOFF 60 #define BLR_MAX_BACKOFF 60
<<<<<<< HEAD
/* max size for error message returned to client */ /* max size for error message returned to client */
#define BINLOG_ERROR_MSG_LEN 385 #define BINLOG_ERROR_MSG_LEN 385