Skip to content

Commit

Permalink
Resolve conflict in cherry-pick of ff78e335d2fbee8d30d3901bc42b2d3e69…
Browse files Browse the repository at this point in the history
…c428e4 and change the commit message
  • Loading branch information
TivonB-AI2 authored and ai-squared committed Dec 21, 2024
1 parent 4103196 commit f6a3c43
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 1 deletion.
4 changes: 4 additions & 0 deletions integrations/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@ GIT
PATH
remote: .
specs:
<<<<<<< HEAD
multiwoven-integrations (0.15.10)
=======
multiwoven-integrations (0.16.1)
>>>>>>> ff78e335 (chore(CE): Update HTTP model spec (#737))
MailchimpMarketing
activesupport
async-websocket
Expand Down
4 changes: 4 additions & 0 deletions integrations/lib/multiwoven/integrations/rollout.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@

module Multiwoven
module Integrations
<<<<<<< HEAD
VERSION = "0.15.10"
=======
VERSION = "0.16.1"
>>>>>>> ff78e335 (chore(CE): Update HTTP model spec (#737))

ENABLED_SOURCES = %w[
Snowflake
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "HTTP Model Endpoint",
"type": "object",
"required": ["url_host"],
"required": ["url_host", "http_method"],
"properties": {
"http_method": {
"type": "string",
Expand Down

0 comments on commit f6a3c43

Please sign in to comment.