Skip to content

Commit

Permalink
chore(CE): resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
afthabvp committed Nov 13, 2024
1 parent 361599f commit 3238c68
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 10 deletions.
2 changes: 1 addition & 1 deletion server/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ gem "interactor", "~> 3.0"

gem "ruby-odbc", git: "https://github.com/Multiwoven/ruby-odbc.git"

gem "multiwoven-integrations", "~> 0.13.1"
gem "multiwoven-integrations", "~> 0.15.0"

gem "temporal-ruby", github: "coinbase/temporal-ruby"

Expand Down
15 changes: 6 additions & 9 deletions server/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1770,10 +1770,7 @@ GEM
net-http
faraday-retry (2.2.1)
faraday (~> 2.0)
ffi (1.17.0-aarch64-linux-gnu)
ffi (1.17.0-arm64-darwin)
ffi (1.17.0-x86_64-darwin)
ffi (1.17.0-x86_64-linux-gnu)
fiber-annotation (0.2.0)
fiber-local (1.1.0)
fiber-storage
Expand Down Expand Up @@ -1935,7 +1932,7 @@ GEM
msgpack (1.7.2)
multi_json (1.15.0)
multipart-post (2.4.1)
multiwoven-integrations (0.13.1)
multiwoven-integrations (0.15.0)
MailchimpMarketing
activesupport
async-websocket
Expand Down Expand Up @@ -1971,7 +1968,7 @@ GEM
zendesk_api
mutex_m (0.2.0)
mysql2 (0.5.6)
net-http (0.5.0)
net-http (0.3.2)
uri
net-imap (0.4.9.1)
date
Expand Down Expand Up @@ -2016,7 +2013,7 @@ GEM
premailer (~> 1.7, >= 1.7.9)
process_executer (1.2.0)
protocol-hpack (1.5.1)
protocol-http (0.43.0)
protocol-http (0.44.0)
protocol-http1 (0.28.1)
protocol-http (~> 0.22)
protocol-http2 (0.20.0)
Expand Down Expand Up @@ -2166,7 +2163,7 @@ GEM
faraday-multipart
gli
hashie
sorbet-runtime (0.5.11645)
sorbet-runtime (0.5.11647)
stringio (3.1.0)
stripe (13.1.1)
strong_migrations (1.8.0)
Expand All @@ -2187,7 +2184,7 @@ GEM
unf_ext (0.0.9.1)
unicode-display_width (2.5.0)
uniform_notifier (1.16.0)
uri (1.0.1)
uri (0.12.0)
uri_template (0.7.0)
warden (1.2.9)
rack (>= 2.0.9)
Expand Down Expand Up @@ -2241,7 +2238,7 @@ DEPENDENCIES
jwt
kaminari
liquid
multiwoven-integrations (~> 0.13.1)
multiwoven-integrations (~> 0.15.0)
mysql2
newrelic_rpm
parallel
Expand Down

0 comments on commit 3238c68

Please sign in to comment.