Resolve conflict in cherry-pick of d0d10d4d0a0eb052ef35f12258bcee1990…

…7a9b22 and change the commit message
Multiwoven · Aug 15, 2024 · 2456c85 · 2456c85
1 parent 13c17f9
commit 2456c85
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.2)
+>>>>>>> d0d10d4d (chore(CE): add request response log for MariaDB (#350))
       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.2"
+>>>>>>> d0d10d4d (chore(CE): add request response log for MariaDB (#350))
 
     ENABLED_SOURCES = %w[
       Snowflake