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 15:06:46 +02:00
parent b4637edd59
commit 520198b870
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
server/modules/routing/binlog/blr_file.c
View File

@ -1476,7 +1476,6 @@ blr_format_event_size(double *event_size, char *label)
label[0] = 'B'; label[0] = 'B';
} }
<<<<<<< HEAD
/** /**
* Read any previously saved master data * Read any previously saved master data
* *