Removed previous conflict line

2015-09-10 14:58:09 +02:00
parent c9fd82839b
commit db93d868f8
1 changed files with 0 additions and 1 deletions
--- a/server/modules/include/blr.h
+++ b/server/modules/include/blr.h
@ -148,7 +148,6 @@
 #define	BLR_MASTER_BACKOFF_TIME	10
 #define BLR_MAX_BACKOFF		60

-<<<<<<< HEAD
 /* max size for error message returned to client */
 #define BINLOG_ERROR_MSG_LEN	385