From 8b535c83657a7b17d2ea2e3be02f0a58bc12e772 Mon Sep 17 00:00:00 2001
From: Pablo Rivera Bengoechea <pablo.bengoechea@squared.ai>
Date: Thu, 18 Jul 2024 17:49:59 -0400
Subject: [PATCH] chore(CE): fixed conflicts

---
 integrations/Gemfile.lock                           | 4 ----
 integrations/lib/multiwoven/integrations/rollout.rb | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/integrations/Gemfile.lock b/integrations/Gemfile.lock
index 37bb1485..06dca624 100644
--- 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
index a843eb31..d35af689 100644
--- 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