Commit b6decd6e authored by Chris Coughlin's avatar Chris Coughlin

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	network/src/main/java/com/emphysic/myriad/network/
parents 79841dd8 b7ebe525
......@@ -72,7 +72,7 @@ public class DataIngestorPool extends LinkedWorkerPool {
* @param numWorkers number of workers to create
public DataIngestorPool(int numWorkers) {
this(numWorkers, false);
this(numWorkers, false)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment