Skip to content

Commit

Permalink
Jduan/fix merge 2 (Azure#26400)
Browse files Browse the repository at this point in the history
* Revert "resolve merge conflict with main (Azure#26393)"

This reverts commit 3d7e4a1.

* Merge remote-tracking branch 'origin/main' into jduan/fix-merge-2

# Conflicts:
#	specification/chaos/resource-manager/readme.md

---------

Co-authored-by: James Duan <jduan@microsoft.com>
  • Loading branch information
MasterRyd3l and James Duan committed Oct 26, 2023
1 parent 3d7e4a1 commit be8c336
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions specification/chaos/resource-manager/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ directive:
transform: >
$["x-ms-client-name"] = "ChaosTargetQuerySelector";
```

### Tag: package-preview-2023-10

These settings apply only when `--tag=package-preview-2023-10` is specified on the command line.
Expand Down Expand Up @@ -133,6 +134,7 @@ directive:
transform: >
$["x-ms-client-name"] = "ChaosTargetQuerySelector";
```

### Tag: package-preview-2023-09

These settings apply only when `--tag=package-preview-2023-09` is specified on the command line.
Expand Down

0 comments on commit be8c336

Please sign in to comment.