From 559f75a010054fddd8fb20b66c0a7c6641f3f2fe Mon Sep 17 00:00:00 2001 From: TivonB-AI2 <124182151+TivonB-AI2@users.noreply.github.com> Date: Fri, 9 Aug 2024 02:03:54 -0400 Subject: [PATCH] Resolve conflict in cherry-pick of 07b100a10f3a869f2d6813de9b223ec3395789db and change the commit message --- integrations/Gemfile.lock | 4 ++++ integrations/lib/multiwoven/integrations/rollout.rb | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/integrations/Gemfile.lock b/integrations/Gemfile.lock index 71ed2acb..8974d9ec 100644 --- a/integrations/Gemfile.lock +++ b/integrations/Gemfile.lock @@ -7,7 +7,11 @@ GIT PATH remote: . specs: +<<<<<<< HEAD multiwoven-integrations (0.7.9) +======= + multiwoven-integrations (0.7.3) +>>>>>>> 07b100a1 (chore(CE): add request response log for Google Sheets (#347)) activesupport async-websocket aws-sdk-athena diff --git a/integrations/lib/multiwoven/integrations/rollout.rb b/integrations/lib/multiwoven/integrations/rollout.rb index 62c6d503..d84e55bd 100644 --- a/integrations/lib/multiwoven/integrations/rollout.rb +++ b/integrations/lib/multiwoven/integrations/rollout.rb @@ -2,7 +2,11 @@ module Multiwoven module Integrations +<<<<<<< HEAD VERSION = "0.7.9" +======= + VERSION = "0.7.3" +>>>>>>> 07b100a1 (chore(CE): add request response log for Google Sheets (#347)) ENABLED_SOURCES = %w[ Snowflake