solved merge conflicts

James Newell · James Newell · commit ebb90446b2e0 · 2013-12-12T18:08:05.000+11:00
diff --git a/src/deit/process/Process.php b/src/deit/process/Process.php
@@ -182,7 +182,6 @@ private function __construct($command, array $options = array()) {
 			'binary_pipes'      => false,
 			'bypass_shell'      => false,
 		);
-		//$options = null;
 
 		// --- setup process pipes ---
 
