From 145e52fb900d788a6282f42ac54b23b7c165fe98 Mon Sep 17 00:00:00 2001
From: Shibayan95 <shibayanchakraborty@gmail.com>
Date: Thu, 23 Apr 2026 16:46:29 +0530
Subject: [PATCH] Resolve conflict in cherry-pick of
 b62baf7af882a28e50bc69f4c4773f2d92cc515b and change the commit message

---
 server/Gemfile      | 5 +++++
 server/Gemfile.lock | 8 ++++++++
 2 files changed, 13 insertions(+)

diff --git a/server/Gemfile b/server/Gemfile
index bb94e30ae..bb03e8372 100644
--- a/server/Gemfile
+++ b/server/Gemfile
@@ -14,7 +14,12 @@ gem "interactor", "~> 3.0"
 
 gem "ruby-odbc", git: "https://github.com/Multiwoven/ruby-odbc.git"
 
+<<<<<<< HEAD
 gem "multiwoven-integrations", "~> 0.34.6"
+=======
+gem "duckdb", "~> 0.10.3" # Pin to match libduckdb v1.0.0 installed in CI/Docker
+gem "multiwoven-integrations", "~> 0.35.3"
+>>>>>>> b62baf7af (fix(CE): update multiwoven-integrations version (#1849))
 
 gem "temporal-ruby", github: "coinbase/temporal-ruby"
 
diff --git a/server/Gemfile.lock b/server/Gemfile.lock
index 8b7d05ce5..4dfe594e7 100644
--- a/server/Gemfile.lock
+++ b/server/Gemfile.lock
@@ -1979,7 +1979,11 @@ GEM
     multi_xml (0.7.2)
       bigdecimal (~> 3.1)
     multipart-post (2.4.1)
+<<<<<<< HEAD
     multiwoven-integrations (0.34.6)
+=======
+    multiwoven-integrations (0.35.3)
+>>>>>>> b62baf7af (fix(CE): update multiwoven-integrations version (#1849))
       MailchimpMarketing
       activesupport
       async-websocket
@@ -2339,7 +2343,11 @@ DEPENDENCIES
   kaminari
   letter_opener
   liquid
+<<<<<<< HEAD
   multiwoven-integrations (~> 0.34.6)
+=======
+  multiwoven-integrations (~> 0.35.3)
+>>>>>>> b62baf7af (fix(CE): update multiwoven-integrations version (#1849))
   mysql2
   newrelic_rpm
   parallel