up

Author: metascroy

backends/test/suite/flow.py

@@ -54,7 +54,6 @@ def __str__(self):
         return self.name
 
 
-<<<<<<< HEAD
 def _register_flow(
     import_fn: Callable[[], list[TestFlow]], backend_name: str
 ) -> list[TestFlow]:
@@ -63,10 +62,6 @@ def _register_flow(
     except Exception as e:
         logger.info(f"Skipping {backend_name} flow registration: {e}")
         return []
-=======
-def all_flows() -> dict[str, TestFlow]:  # noqa: C901
-    flows = []
->>>>>>> af6810bfa4 (up)
 
 
 def _load_xnnpack() -> list[TestFlow]: