resolve conflict

AliyunContainerService · Apr 10, 2018 · 20d2af5 · 20d2af5
1 parent c5662fe
commit 20d2af5
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/pkg/quota/prjquota.go b/pkg/quota/prjquota.go
@@ -120,9 +120,6 @@ func (quota *PrjQuota) SetDiskQuota(dir string, size string, quotaID int) error
 	}
 
 	limit, err := bytefmt.ToKilobytes(size)
-	if err != nil {
-		return err
-	}
 
 	// transfer limit from kbyte to byte
 	if err := quota.checkDevLimit(dir, limit*1024); err != nil {