From c4a51f3ec7cfe76178fa96514d6f7fc8f95fc639 Mon Sep 17 00:00:00 2001
From: afthab vp <afthab@multiwoven.com>
Date: Mon, 12 Aug 2024 16:07:00 +0530
Subject: [PATCH] Resolve conflict in cherry-pick of
 27c4c0e45853349f46179435d764cbd7942e44d1 and change the commit message

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

diff --git a/integrations/Gemfile b/integrations/Gemfile
index 1b82fbae..757d6502 100644
--- a/integrations/Gemfile
+++ b/integrations/Gemfile
@@ -67,7 +67,7 @@ gem "mysql2"
 
 gem "aws-sdk-sts"
 
-gem "ruby-oci8"
+gem "ruby-oci8", "~> 2.2.12"
 
 group :development, :test do
   gem "simplecov", require: false
diff --git a/integrations/Gemfile.lock b/integrations/Gemfile.lock
index 71ed2acb..d4746b7b 100644
--- a/integrations/Gemfile.lock
+++ b/integrations/Gemfile.lock
@@ -7,7 +7,11 @@ GIT
 PATH
   remote: .
   specs:
+<<<<<<< HEAD
     multiwoven-integrations (0.7.9)
+=======
+    multiwoven-integrations (0.8.1)
+>>>>>>> 27c4c0e4 (chore(CE): fix oci8 version (#375))
       activesupport
       async-websocket
       aws-sdk-athena
@@ -360,7 +364,7 @@ DEPENDENCIES
   rspec (~> 3.0)
   rubocop (~> 1.21)
   ruby-limiter
-  ruby-oci8
+  ruby-oci8 (~> 2.2.12)
   ruby-odbc!
   rubyzip
   sequel
diff --git a/integrations/lib/multiwoven/integrations/rollout.rb b/integrations/lib/multiwoven/integrations/rollout.rb
index 62c6d503..ccb67dd0 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.7.9"
+=======
+    VERSION = "0.8.1"
+>>>>>>> 27c4c0e4 (chore(CE): fix oci8 version (#375))
 
     ENABLED_SOURCES = %w[
       Snowflake