Skip to content

Commit

Permalink
Merge pull request #154 from radicalxdev/fix/conflict
Browse files Browse the repository at this point in the history
Resolved merge conflicts
  • Loading branch information
bkb-Git authored Sep 18, 2024
2 parents 092a7c3 + d11d49d commit 70a6af3
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion functions/controllers/marvelAIController.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const DEBUG = process.env.DEBUG;
/**
* Simulates communication with the Marvel AI endpoint.
*
* @function kaiCommunicator
* @function marvelCommunicator
* @param {object} payload - The properties of the communication.
* @param {object} props.data - The payload data object used in the communication.
* @param {Array} props.data.messages - An array of messages for the current user chat session.
Expand Down

0 comments on commit 70a6af3

Please sign in to comment.