more changes

temporalio · Apr 4, 2024 · 8bf55f9 · 8bf55f9
1 parent db6d017
commit 8bf55f9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/temporal/api/cloud/cloudservice/v1/request_response.proto b/temporal/api/cloud/cloudservice/v1/request_response.proto
@@ -232,7 +232,6 @@ message GetRegionResponse {
     temporal.api.cloud.region.v1.Region region = 1;
 }
 
-<<<<<<< HEAD
 message GetIncomingServicesRequest {
     // The requested size of the page to retrieve - optional.
     // Cannot exceed 1000. Defaults to 100. 
@@ -370,7 +369,10 @@ message CreateOutgoingServiceRequest {
 }
 
 message CreateOutgoingServiceResponse {
-=======
+    // The async operation.
+    temporal.api.cloud.operation.v1.AsyncOperation async_operation = 1;
+}
+
 message GetAccountRequest {
 }
 
@@ -391,12 +393,10 @@ message UpdateAccountRequest {
 }
 
 message UpdateAccountResponse {
->>>>>>> origin/abhinav/accountManagement
     // The async operation.
     temporal.api.cloud.operation.v1.AsyncOperation async_operation = 1;
 }
 
-<<<<<<< HEAD
 message UpdateOutgoingServiceRequest {
     // The name of the namespace the outgoing service is registered on.
     string namespace = 1;
@@ -439,5 +439,3 @@ message DeleteOutgoingServiceResponse {
     // The async operation.
     temporal.api.cloud.operation.v1.AsyncOperation async_operation = 1;
 }
-=======
->>>>>>> origin/abhinav/accountManagement
diff --git a/temporal/api/cloud/cloudservice/v1/service.proto b/temporal/api/cloud/cloudservice/v1/service.proto
@@ -119,7 +119,6 @@ service CloudService {
         };
     }
 
-<<<<<<< HEAD
     // Gets all known incoming services
     rpc GetIncomingServices(GetIncomingServicesRequest) returns (GetIncomingServicesResponse) {
 	option (google.api.http) = {
@@ -191,7 +190,9 @@ service CloudService {
     rpc DeleteOutgoingService(DeleteOutgoingServiceRequest) returns (DeleteOutgoingServiceResponse) {
 	option (google.api.http) = {
             delete: "/api/v1/namespaces/{namespace}/nexus/outgoingservices/{name}",
-=======
+        };
+    }
+
     // Get account information
     rpc GetAccount (GetAccountRequest) returns (GetAccountResponse) {
         option (google.api.http) = {
@@ -204,7 +205,6 @@ service CloudService {
         option (google.api.http) = {
             post: "/api/v1/account",
             body: "*"
->>>>>>> origin/abhinav/accountManagement
         };
     }
 }