fixed merge bug (that caused an e2e failure)

Author: ATGardner

cmd/argocd/commands/app.go

@@ -1171,7 +1171,7 @@ func getLocalObjectsString(ctx context.Context, app *argoappv1.Application, proj
 		ProjectName:                     proj.Name,
 		ProjectSourceRepos:              proj.Spec.SourceRepos,
 		AnnotationManifestGeneratePaths: app.GetAnnotation(argoappv1.AnnotationKeyManifestGeneratePaths),
-	}, false, nil, true, &git.NoopCredsStore{}, nil, resource.MustParse("0"), nil, nil)
+	}, false, nil, true, &git.NoopCredsStore{}, nil, resource.MustParse("0"), nil)
 	errors.CheckError(err)
 
 	return res.GetCompiledManifests()