From 754b48ebe27000105bbb3bf5f9cbd51112b0a9f2 Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Tue, 6 Jun 2023 23:43:59 +0800 Subject: [PATCH] resolve the conflict --- .../hosts/resolve/utility_scripts/openpype_startup.scriptlib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/hosts/resolve/utility_scripts/openpype_startup.scriptlib b/openpype/hosts/resolve/utility_scripts/openpype_startup.scriptlib index 324c82d6b7..ec9b30a18d 100644 --- a/openpype/hosts/resolve/utility_scripts/openpype_startup.scriptlib +++ b/openpype/hosts/resolve/utility_scripts/openpype_startup.scriptlib @@ -18,4 +18,4 @@ if openpype_startup_script ~= nil then else print("Launch script not found at: " .. script) end -end +end \ No newline at end of file