Skip to content

Commit eb69501

Browse files
committed
fixed conflict
2 parents e87a030 + 674707e commit eb69501

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/Resources/Resources/ChangeLog.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
-->
2020

2121
## Upcoming Release
22+
* Use JsonExtensions to serialize deserialize JSON objects to ensure we use custom serialization settings [#15552]
2223

2324
## Version 4.3.0
2425
* Fixed bug with `PSResource` where some constructors left `SubscriptionId` property unassigned/null. [#10783]
2526
* Added support for creating and updating Template Spec in Bicep file [#15313]
2627
* Added `-ProceedIfNoChange` parameter to deployment create cmdlets.
27-
* Use JsonExtensions to serialize deserialize JSON objects to ensure we use custom serialization settings [#15552]
2828

2929
## Version 4.2.0
3030
* Allowed naming the deployment when testing deployments [#11497]

0 commit comments

Comments
 (0)