resolve conflicts

LiamHamsters · LiamHamsters · commit e2a7594977e0 · 2025-08-26T16:11:38.000+03:00
diff --git a/src/Ydb.Sdk/CHANGELOG.md b/src/Ydb.Sdk/CHANGELOG.md
@@ -1,4 +1,5 @@
 - Dev: Parameterized Decimal overflow check (precision/scale).
+- Feat: Implement `YdbRetryPolicy` with AWS-inspired Exponential Backoff and Jitter.
 - Dev: LogLevel `Warning` -> `Debug` on DeleteSession has been `RpcException`.
 
 ## v0.22.0

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`- Dev: Parameterized Decimal overflow check (precision/scale).`
	`2`	+- Feat: Implement `YdbRetryPolicy` with AWS-inspired Exponential Backoff and Jitter.
`2`	`3`	- Dev: LogLevel `Warning` -> `Debug` on DeleteSession has been `RpcException`.
`3`	`4`
`4`	`5`	`## v0.22.0`