From 797e92451633ebd14f05733a7541b76d01b2d2b7 Mon Sep 17 00:00:00 2001 From: TivonB-AI2 <124182151+TivonB-AI2@users.noreply.github.com> Date: Fri, 9 Aug 2024 02:15:58 -0400 Subject: [PATCH] Resolve conflict in cherry-pick of f48f9738c40ba5d3ea827548ffb649a546272b6c 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..f15fc93b 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.5) +>>>>>>> f48f9738 (chore(CE): add request response log for Iterable (#348)) activesupport async-websocket aws-sdk-athena diff --git a/integrations/lib/multiwoven/integrations/rollout.rb b/integrations/lib/multiwoven/integrations/rollout.rb index 62c6d503..2f47492f 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.5" +>>>>>>> f48f9738 (chore(CE): add request response log for Iterable (#348)) ENABLED_SOURCES = %w[ Snowflake