fix pyi

Lancetnik · Jun 13, 2023 · 5e90c07 · 5e90c07
1 parent 2fb1d17
commit 5e90c07
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 30 deletions.
diff --git a/propan/fastapi/kafka/router.pyi b/propan/fastapi/kafka/router.pyi
@@ -26,13 +26,7 @@ from propan.types import AnyCallable
 
 Partition = TypeVar("Partition")
 
-<<<<<<< HEAD
-class KafkaRouter(PropanRouter):
-    broker: KafkaBroker
-
-=======
 class KafkaRouter(PropanRouter[KafkaBroker]):
->>>>>>> 1acd1a468477ed27a085d3d1c6f38d967e64f1f9
     def __init__(
         self,
         bootstrap_servers: Union[str, List[str]] = "localhost",

diff --git a/propan/fastapi/nats/router.pyi b/propan/fastapi/nats/router.pyi
@@ -32,13 +32,7 @@ from propan.fastapi.core.router import PropanRouter
 from propan.log import access_logger
 from propan.types import AnyCallable
 
-<<<<<<< HEAD
-class NatsRouter(PropanRouter):
-    broker: NatsBroker
-
-=======
 class NatsRouter(PropanRouter[NatsBroker]):
->>>>>>> 1acd1a468477ed27a085d3d1c6f38d967e64f1f9
     def __init__(
         self,
         servers: Union[str, List[str]] = ["nats://localhost:4222"],  # noqa: B006

diff --git a/propan/fastapi/rabbit/router.pyi b/propan/fastapi/rabbit/router.pyi
@@ -19,13 +19,7 @@ from propan.fastapi.core import PropanRouter
 from propan.log import access_logger
 from propan.types import AnyCallable
 
-<<<<<<< HEAD
-class RabbitRouter(PropanRouter):
-    broker: RabbitBroker
-
-=======
 class RabbitRouter(PropanRouter[RabbitBroker]):
->>>>>>> 1acd1a468477ed27a085d3d1c6f38d967e64f1f9
     def __init__(
         self,
         host: str = "localhost",

diff --git a/propan/fastapi/redis/router.pyi b/propan/fastapi/redis/router.pyi
@@ -16,13 +16,7 @@ from propan.fastapi.core.router import PropanRouter
 from propan.log import access_logger
 from propan.types import AnyCallable
 
-<<<<<<< HEAD
-class RedisRouter(PropanRouter):
-    broker: RedisBroker
-
-=======
 class RedisRouter(PropanRouter[RedisBroker]):
->>>>>>> 1acd1a468477ed27a085d3d1c6f38d967e64f1f9
     def __init__(
         self,
         url: str = "redis://localhost:6379",

diff --git a/propan/fastapi/sqs/router.pyi b/propan/fastapi/sqs/router.pyi
@@ -17,13 +17,7 @@ from propan.fastapi.core.router import PropanRouter
 from propan.log import access_logger
 from propan.types import AnyCallable
 
-<<<<<<< HEAD
-class SQSRouter(PropanRouter):
-    broker: SQSBroker
-
-=======
 class SQSRouter(PropanRouter[SQSBroker]):
->>>>>>> 1acd1a468477ed27a085d3d1c6f38d967e64f1f9
     def __init__(
         self,
         url: str = "http://localhost:9324/",