fixed merge conflicts

1 day ago · 7482a9b976
parent edaea9fa0b
commit 7482a9b976
3 changed files with 0 additions and 4 deletions
--- a/docs/llm.txt
+++ b/docs/llm.txt
@ -24130,7 +24130,6 @@ flowchart LR

 - Maintains strict ordering of task processing

-
 ### Star Swarm
 ```python
 def star_swarm(agents: AgentListType, tasks: List[str], return_full_history: bool = True)
@ -24364,7 +24363,6 @@ flowchart TD
 ## Common Use Cases

 1. **Data Processing Pipelines**
-   - Linear Swarm
   - Circular Swarm

 2. **Distributed Computing**
--- a/docs/swarms/examples/unique_swarms.md
+++ b/docs/swarms/examples/unique_swarms.md
@ -294,7 +294,6 @@ flowchart TD
 ## Common Use Cases

 1. **Data Processing Pipelines**
-   - Linear Swarm
   - Circular Swarm

 2. **Distributed Computing**
--- a/swarms/structs/swarming_architectures.py
+++ b/swarms/structs/swarming_architectures.py
@ -106,7 +106,6 @@ def grid_swarm(

    return history_output_formatter(conversation, output_type)

-
 # Star Swarm: A central agent first processes all tasks, followed by others
 def star_swarm(
    agents: AgentListType,