Changes for conflict

Signed-off-by: Yashvi Jain <Yashvi.jain@progress.com>
chef · Jan 11, 2022 · 2737de0 · 2737de0
1 parent cea6386
commit 2737de0
Showing 1 changed file with 0 additions and 4 deletions.
diff --git 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
 }
-