From dd1325b428f7a77fdf7dbc7ce5d2014c3260e2d5 Mon Sep 17 00:00:00 2001
From: "Rafael E. O'Neill"
 <106079170+RafaelOAiSquared@users.noreply.github.com>
Date: Wed, 19 Nov 2025 14:52:22 -0400
Subject: [PATCH] Resolve conflict in cherry-pick of
 6c3a76f44ae38c0f4d791db9ace8d53d762345de and change the commit message

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

diff --git a/server/Gemfile b/server/Gemfile
index d994e040..b4c39339 100644
--- a/server/Gemfile
+++ b/server/Gemfile
@@ -14,7 +14,11 @@ gem "interactor", "~> 3.0"
 
 gem "ruby-odbc", git: "https://github.com/Multiwoven/ruby-odbc.git"
 
+<<<<<<< HEAD
 gem "multiwoven-integrations", "~> 0.34.5"
+=======
+gem "multiwoven-integrations", "~> 0.34.11"
+>>>>>>> 6c3a76f4 (chore(CE): upgrade integrations gem to 0.34.11 (#1481))
 
 gem "temporal-ruby", github: "coinbase/temporal-ruby"
 
diff --git a/server/Gemfile.lock b/server/Gemfile.lock
index 2e0fbc2a..7bb28555 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.5)
+=======
+    multiwoven-integrations (0.34.11)
+>>>>>>> 6c3a76f4 (chore(CE): upgrade integrations gem to 0.34.11 (#1481))
       MailchimpMarketing
       activesupport
       async-websocket
@@ -2339,7 +2343,11 @@ DEPENDENCIES
   kaminari
   letter_opener
   liquid
+<<<<<<< HEAD
   multiwoven-integrations (~> 0.34.5)
+=======
+  multiwoven-integrations (~> 0.34.11)
+>>>>>>> 6c3a76f4 (chore(CE): upgrade integrations gem to 0.34.11 (#1481))
   mysql2
   newrelic_rpm
   parallel