chore(CE): fixed conflicts

Multiwoven · Jul 18, 2024 · 8b535c8 · 8b535c8
1 parent b0a579a
commit 8b535c8
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.4.1)
-=======
     multiwoven-integrations (0.5.1)
->>>>>>> 8e7e2d5d (fix(CE): DuckDB httpfs extension requirement (#298))
       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.4.1"
-=======
     VERSION = "0.5.1"
->>>>>>> 8e7e2d5d (fix(CE): DuckDB httpfs extension requirement (#298))
 
     ENABLED_SOURCES = %w[
       Snowflake