I guess I do not like GitHub's conflict-resolution interface.

Author: cboulay

src/lsl_outlet_c.cpp

@@ -29,11 +29,6 @@ LIBLSL_C_API lsl_outlet lsl_create_outlet(
 	return lsl_create_outlet_d(info, chunk_size, (double)max_buffered, 1);
 }
 
-LIBLSL_C_API lsl_outlet lsl_create_outlet(
-	lsl_streaminfo info, int32_t chunk_size, int32_t max_buffered) {
-	return lsl_create_outlet_d(info, chunk_size, (double)max_buffered);
-}
-
 LIBLSL_C_API void lsl_destroy_outlet(lsl_outlet out) {
 	try {
 		delete out;