From 2737de0d7ba90ed5eaab00672f70b37c0aea765a Mon Sep 17 00:00:00 2001 From: Yashvi Jain Date: Mon, 10 Jan 2022 10:53:53 +0530 Subject: [PATCH] Changes for conflict Signed-off-by: Yashvi Jain --- components/infra-proxy-service/server/orgs.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/components/infra-proxy-service/server/orgs.go b/components/infra-proxy-service/server/orgs.go index 3d2bf5665e4..f1d20deec7f 100644 --- a/components/infra-proxy-service/server/orgs.go +++ b/components/infra-proxy-service/server/orgs.go @@ -6,10 +6,7 @@ import ( "github.com/chef/automate/api/external/common/query" secrets "github.com/chef/automate/api/external/secrets" -<<<<<<< HEAD -======= "github.com/chef/automate/api/interservice/authz" ->>>>>>> 960571021 (stash changes) "github.com/chef/automate/api/interservice/infra_proxy/request" "github.com/chef/automate/api/interservice/infra_proxy/response" "github.com/chef/automate/components/infra-proxy-service/service" @@ -299,4 +296,3 @@ func createProjectFromOrgIdAndServerID(s *Server, ctx context.Context, serverId return []string{projectID.Project.Name}, nil } -