Removed previous conflict line

2015-09-10 15:06:46 +02:00
parent b4637edd59
commit 520198b870
1 changed files with 0 additions and 1 deletions
--- a/server/modules/routing/binlog/blr_file.c
+++ b/server/modules/routing/binlog/blr_file.c
@ -1476,7 +1476,6 @@ blr_format_event_size(double *event_size, char *label)
 		label[0] = 'B';
 }

-<<<<<<< HEAD
 /**
 * Read any previously saved master data
 *