From 409ce88ede95739ac3db5c427215c4ada36c3751 Mon Sep 17 00:00:00 2001
From: Marc Cataford <mcat@riseup.net>
Date: Sun, 14 Apr 2024 00:19:19 -0400
Subject: [PATCH] fix: resolve sneaky merge conflict in lock-deps

---
 script/lock-deps.sh | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/script/lock-deps.sh b/script/lock-deps.sh
index 0a6f04e..fd4b85c 100755
--- a/script/lock-deps.sh
+++ b/script/lock-deps.sh
@@ -28,10 +28,6 @@ python -m piptools compile \
 python -m piptools compile \
     -o requirements_test.txt \
     --no-header \
-    --extra tes# This is the commit message #2:
-
-chore: formatting
-
-t \
+    --extra test \
     --constraint requirements.txt \
     pyproject.toml