fix merge

This commit is contained in:
PolynomialDivision 2018-01-04 23:42:59 +01:00
parent 477a2b0645
commit 300234a5c4

View file

@ -221,7 +221,6 @@ int build_network_overview(struct blob_buf *b)
}
return 0;
}
>>>>>>> master
int eval_probe_metric(struct probe_entry_s probe_entry) {