From 50f493c12d0a5ff195795a23773d3ae43ba45109 Mon Sep 17 00:00:00 2001
From: Trenton H <797416+stumpylog@users.noreply.github.com>
Date: Fri, 28 Feb 2025 13:20:20 -0800
Subject: [PATCH] Fixes merge

---
 docs/development.md | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/docs/development.md b/docs/development.md
index 61d34c1a3..f332b56c7 100644
--- a/docs/development.md
+++ b/docs/development.md
@@ -344,17 +344,7 @@ If you want to build the documentation locally, this is how you do it:
 1.  Build the documentation
 
     ```bash
-<<<<<<< HEAD
-    pipenv install --dev
-    ```
-
-2.  Build the documentation
-
-    ```bash
-    mkdocs build --config-file mkdocs.yml
-=======
     $ uv run mkdocs build --config-file mkdocs.yml
->>>>>>> a1d6df0dc (Further purging of pipenv)
     ```
 
     _alternatively..._