Resolve conflict

huggingface · Feb 20, 2023 · ff0cc52 · ff0cc52
1 parent fdb0f75
commit ff0cc52
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/transformers/models/whisper/configuration_whisper.py b/src/transformers/models/whisper/configuration_whisper.py
@@ -224,7 +224,7 @@ def __init__(
         mask_feature_prob=0.0,
         mask_feature_length=10,
         mask_feature_min_masks=0,
-        **kwargs
+        **kwargs,
     ):
         self.vocab_size = vocab_size
         self.num_mel_bins = num_mel_bins