Resolve rebase conflicts

LuckySting · LuckySting · commit 80a61f1d2299 · 2024-02-06T11:02:47.000+01:00
diff --git a/ydb_sqlalchemy/dbapi/errors.py b/ydb_sqlalchemy/dbapi/errors.py
@@ -1,4 +1,4 @@
-from typing import Optional, List
+from typing import List, Optional
 
 import ydb
 from google.protobuf.message import Message

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from typing import Optional, List`
	`1`	`+from typing import List, Optional`
`2`	`2`
`3`	`3`	`import ydb`
`4`	`4`	`from google.protobuf.message import Message`