remove junk

2026-09-09 11:16:00 +08:00 · 2021-04-08 12:17:02 +02:00
parent ba80e82520
commit 3f0993aebe
1 changed files with 0 additions and 4 deletions
@@ -217,11 +217,7 @@ class MelganFeatureLoss(nn.Module):
    def forward(self, fake_feats, real_feats):
        loss_feats = 0
        num_feats = 0
-<<<<<<< HEAD
        for idx, _ in enumerate(fake_feats):
-=======
-        for idx in range(len(fake_feats)):
->>>>>>> fix #419
            for fake_feat, real_feat in zip(fake_feats[idx], real_feats[idx]):
                loss_feats += self.loss_func(fake_feat, real_feat)
                num_feats += 1