fix conflict

3 years ago · c55c1cf553
parent 84f624f304 acf1d27230
commit c55c1cf553
1 changed files with 1 additions and 1 deletions
--- a/speechx/speechx/asr/nnet/nnet_producer.cc
+++ b/speechx/speechx/asr/nnet/nnet_producer.cc
@ -79,4 +79,4 @@ void NnetProducer::AttentionRescoring(const std::vector<std::vector<int>>& hyps,
    nnet_->AttentionRescoring(hyps, reverse_weight, rescoring_score);
 }

-}  // namespace ppspeech
+}  // namespace ppspeech