From 7482a9b9760868cdc69da5df76253bdf925207af Mon Sep 17 00:00:00 2001
From: Hugh <155223694+hughiwnl@users.noreply.github.com>
Date: Tue, 2 Dec 2025 12:14:42 -0800
Subject: [PATCH] fixed merge conflicts

---
 docs/llm.txt                             | 2 --
 docs/swarms/examples/unique_swarms.md    | 1 -
 swarms/structs/swarming_architectures.py | 1 -
 3 files changed, 4 deletions(-)

diff --git a/docs/llm.txt b/docs/llm.txt
index 2a0709b1..d6674264 100644
--- 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**
diff --git a/docs/swarms/examples/unique_swarms.md b/docs/swarms/examples/unique_swarms.md
index a4a37bb6..af3b30e1 100644
--- 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**
diff --git a/swarms/structs/swarming_architectures.py b/swarms/structs/swarming_architectures.py
index f2c09bed..033a083f 100644
--- 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,