refactor(CE): resolved conflicts in integrations

Multiwoven · Sep 5, 2024 · 6cfe09c · 6cfe09c
1 parent 723fe8b
commit 6cfe09c
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git a/integrations/Gemfile.lock b/integrations/Gemfile.lock
@@ -7,11 +7,7 @@ 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,11 +2,7 @@
 
 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