fix: resolve merge conflicts for PR #297 - Fireworks AI documentation #300
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…s AI documentation from main
roomote
bot
requested review from
cte,
hannesrudolph and
mrubens
as code owners
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR resolves the merge conflicts in #297 by:
The conflict arose because both branches added the same file (
docs/providers/fireworks.md) with different content. The main branch version was chosen as it contains more detailed and up-to-date information.Resolves conflicts in #297
Important
Resolves merge conflicts in
fireworks.mdby keeping the main branch version and updatessidebars.tsto include Fireworks provider.docs/providers/fireworks.mdby keeping the main branch version with detailed model information, pricing, and comparison table.sidebars.tsincludes the Fireworks provider entry.This description was created by
for ca79a14. You can customize this summary. It will automatically update as commits are pushed.