resolved conflicts

Signed-off-by: Taejin Park <[email protected]>
NVIDIA · Dec 7, 2022 · bcaf7bc · bcaf7bc
2 parents 896238b + 0abdfda
commit bcaf7bc
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/nemo/collections/asr/parts/utils/online_clustering.py b/nemo/collections/asr/parts/utils/online_clustering.py
@@ -354,7 +354,7 @@ def get_closest_embeddings(
     affinity_mat: torch.Tensor, n_closest: int
 ) -> Tuple[torch.Tensor, torch.Tensor]:
     """
-    Get the indeces of the embedding vectors we want to merge.
+    Get the indices of the embedding vectors we want to merge.
 
     Example:
         >>> n_closest = 2