From 48f74a86d6b68abca10800613f56f38fa7ec9b7d Mon Sep 17 00:00:00 2001
From: TivonB-AI2 <124182151+TivonB-AI2@users.noreply.github.com>
Date: Tue, 16 Jul 2024 14:35:17 -0400
Subject: [PATCH 1/2] Resolve conflict in cherry-pick of
 1f2f12dd2803441737d807ef6e94ffbe9db53617 and change the commit message

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

diff --git a/integrations/Gemfile.lock b/integrations/Gemfile.lock
index 35f8e9bd..595830e4 100644
--- a/integrations/Gemfile.lock
+++ b/integrations/Gemfile.lock
@@ -7,7 +7,11 @@ GIT
 PATH
   remote: .
   specs:
+<<<<<<< HEAD
     multiwoven-integrations (0.4.1)
+=======
+    multiwoven-integrations (0.5.2)
+>>>>>>> 1f2f12dd (fix(CE): fix gem (#304))
       activesupport
       async-websocket
       aws-sdk-athena
diff --git a/integrations/lib/multiwoven/integrations/rollout.rb b/integrations/lib/multiwoven/integrations/rollout.rb
index d7cd5fd9..af5050ff 100644
--- 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.4.1"
+=======
+    VERSION = "0.5.2"
+>>>>>>> 1f2f12dd (fix(CE): fix gem (#304))
 
     ENABLED_SOURCES = %w[
       Snowflake

From b9034c5ffeeb78e562096da9971a7b2d9dadbbc5 Mon Sep 17 00:00:00 2001
From: TivonB-AI2 <tivon.brown@squared.ai>
Date: Fri, 26 Jul 2024 11:14:58 -0400
Subject: [PATCH 2/2] fix(CE): fixing conflict

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

diff --git a/integrations/Gemfile.lock b/integrations/Gemfile.lock
index 595830e4..fb0b8ee2 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.2)
->>>>>>> 1f2f12dd (fix(CE): fix gem (#304))
       activesupport
       async-websocket
       aws-sdk-athena
diff --git a/integrations/lib/multiwoven/integrations/rollout.rb b/integrations/lib/multiwoven/integrations/rollout.rb
index af5050ff..76ece7b2 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.2"
->>>>>>> 1f2f12dd (fix(CE): fix gem (#304))
 
     ENABLED_SOURCES = %w[
       Snowflake
@@ -37,6 +33,7 @@ module Integrations
       Http
       Iterable
       MariaDB
+      DatabricksLakehouse
     ].freeze
   end
 end