fix mermge conflicts

pulumi · Nov 14, 2022 · 2898ead · 2898ead
1 parent 489c77b
commit 2898ead
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/sdk/dotnet/GetLogs.cs b/sdk/dotnet/GetLogs.cs
@@ -15,13 +15,13 @@ public static class GetLogs
         /// `docker.getLogs` provides logs from specific container
         /// </summary>
         public static Task<GetLogsResult> InvokeAsync(GetLogsArgs args, InvokeOptions? options = null)
-            => Pulumi.Deployment.Instance.InvokeAsync<GetLogsResult>("docker:index/getLogs:getLogs", args ?? new GetLogsArgs(), options.WithDefaults());
+            => global::Pulumi.Deployment.Instance.InvokeAsync<GetLogsResult>("docker:index/getLogs:getLogs", args ?? new GetLogsArgs(), options.WithDefaults());
 
         /// <summary>
         /// `docker.getLogs` provides logs from specific container
         /// </summary>
         public static Output<GetLogsResult> Invoke(GetLogsInvokeArgs args, InvokeOptions? options = null)
-            => Pulumi.Deployment.Instance.Invoke<GetLogsResult>("docker:index/getLogs:getLogs", args ?? new GetLogsInvokeArgs(), options.WithDefaults());
+            => global::Pulumi.Deployment.Instance.Invoke<GetLogsResult>("docker:index/getLogs:getLogs", args ?? new GetLogsInvokeArgs(), options.WithDefaults());
     }
 
 

diff --git a/sdk/nodejs/index.ts b/sdk/nodejs/index.ts
@@ -10,6 +10,11 @@ export type Container = import("./container").Container;
 export const Container: typeof import("./container").Container = null as any;
 utilities.lazyLoad(exports, ["Container"], () => require("./container"));
 
+export { GetLogsArgs, GetLogsResult, GetLogsOutputArgs } from "./getLogs";
+export const getLogs: typeof import("./getLogs").getLogs = null as any;
+export const getLogsOutput: typeof import("./getLogs").getLogsOutput = null as any;
+utilities.lazyLoad(exports, ["getLogs","getLogsOutput"], () => require("./getLogs"));
+
 export { GetNetworkArgs, GetNetworkResult, GetNetworkOutputArgs } from "./getNetwork";
 export const getNetwork: typeof import("./getNetwork").getNetwork = null as any;
 export const getNetworkOutput: typeof import("./getNetwork").getNetworkOutput = null as any;
@@ -85,6 +90,7 @@ export type Volume = import("./volume").Volume;
 export const Volume: typeof import("./volume").Volume = null as any;
 utilities.lazyLoad(exports, ["Volume"], () => require("./volume"));
 
+
 // Export sub-modules:
 import * as config from "./config";
 import * as types from "./types";