Resolve conflict in cherry-pick of 38666561eed8c6fafc10276bfc0f8d9b2f…

…b81fa7 and change the commit message
Multiwoven · Aug 15, 2024 · 1c8228d · 1c8228d
1 parent 13c17f9
commit 1c8228d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git 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.7)
+>>>>>>> 38666561 (chore(CE): add request reponse log for Airtable (#342))
       activesupport
       async-websocket
       aws-sdk-athena

diff --git 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.7"
+>>>>>>> 38666561 (chore(CE): add request reponse log for Airtable (#342))
 
     ENABLED_SOURCES = %w[
       Snowflake