From 25e7bb0adf4fbad57d755e7a2254ccf74a1b601d Mon Sep 17 00:00:00 2001
From: Brandon Hancock <brandon@brandonhancock.io>
Date: Tue, 1 Oct 2024 14:17:18 -0400
Subject: [PATCH] Fix merge conflict

---
 src/crewai/flow/flow.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/crewai/flow/flow.py b/src/crewai/flow/flow.py
index a05f644b5..f60e5c1e3 100644
--- a/src/crewai/flow/flow.py
+++ b/src/crewai/flow/flow.py
@@ -63,7 +63,6 @@ def listen(condition):
     return decorator
 
 
-def router(method, paths=None):
 def router(method, paths=None):
     def decorator(func):
         func.__is_router__ = True