author | Daniel Povey <dpovey@gmail.com> | |
Wed, 18 Jan 2017 21:32:21 +0000 (16:32 -0500) | ||
committer | Daniel Povey <dpovey@gmail.com> | |
Wed, 18 Jan 2017 21:32:21 +0000 (16:32 -0500) |
Conflicts:
src/nnet3/nnet-computation.cc
src/nnet3/nnet-computation.cc
Trivial merge