fix: Resolve conflicts in main.json files #748
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
fix: Merging the changes from dev to main
fix: merging dev changes to main
* Update SampleQuestions.md with response time note (#736) Added a note about average response time and formatted the document. Co-authored-by: Prajwal-Microsoft <[email protected]> * fix: update API version to 2025-04-01 and adjust skuCapacity in main.bicep * fix: rename deploymentType parameter to gptModelDeploymentType for clarity * fix: Re-query data after updating sample data to refresh rows (#739) * DataRefreshLogic * pylint * pylintfix * fix * fix: clarify skuCapacity comment in main.bicep for WAF deployment * fix: update skuCapacity configuration for WAF deployment to ensure correct agent handling --------- Co-authored-by: Prajwal-Microsoft <[email protected]> Co-authored-by: Pavan-Microsoft <[email protected]> Co-authored-by: UtkarshMishra-Microsoft <[email protected]>
Added a disclaimer about AI solutions and compliance.
Removed disclaimer about AI solutions and associated risks.
* Add disclaimer for AI solutions in README Added a disclaimer regarding AI solutions and associated risks. * Update README.md --------- Co-authored-by: Roopan-Microsoft <[email protected]>
NirajC-Microsoft
requested review from
Avijit-Microsoft,
Prajwal-Microsoft,
Roopan-Microsoft,
Vinay-Microsoft and
aniaroramsft
as code owners
NirajC-Microsoft
changed the title
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.
Purpose
Does this introduce a breaking change?
Golden Path Validation
Deployment Validation
What to Check
Verify that the following are valid
Other Information