Auto stash before merge of "dev" and "origin/dev"

dataflow_neuro/primitives.act

@@ -112,7 +112,7 @@ namespace tmpl {
 
 
             BUF_X1 reset_buf(.a=reset_B, .y=_reset_BX,.vdd=supply.vdd,.vss=supply.vss);
-	    sigbuf<N> reset_bufarray(.in=_reset_BX, .out=_reset_BXX);
+	          sigbuf<N> reset_bufarray(.in=_reset_BX, .out=_reset_BXX);
 	    
             //validity
             bool _in_v;