chore(CE): fixed conflicts

Multiwoven · Jul 8, 2024 · 386d337 · 386d337
1 parent 3061bcf
commit 386d337
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.3.4)
-=======
     multiwoven-integrations (0.4.1)
->>>>>>> 76afbbf8 (refactor(CE): remove credential param from STS client init (#264))
       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.3.4"
-=======
     VERSION = "0.4.1"
->>>>>>> 76afbbf8 (refactor(CE): remove credential param from STS client init (#264))
 
     ENABLED_SOURCES = %w[
       Snowflake