merge resolution

Edmond Yoo

2018-09-06 eb46166f1130d6c6fb5d41d6090a86b35d1542fc

 src/network.h

@@ -151,6 +151,7 @@
int get_network_nuisance(network net);
int get_network_background(network net);
YOLODLL_API void fuse_conv_batchnorm(network net);
YOLODLL_API void calculate_binary_weights(network net);

#ifdef __cplusplus
}