From ee1454ec4bfc9508fde93750197118d9959f3764 Mon Sep 17 00:00:00 2001
From: Roy Dumblauskas <roydumblauskas@gmail.com>
Date: Sun, 12 Oct 2025 18:18:08 -0500
Subject: [PATCH] merge conflicts

---
 nixos/flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/flake.lock b/nixos/flake.lock
index 032c6f2..4972372 100755
--- a/nixos/flake.lock
+++ b/nixos/flake.lock
@@ -455,11 +455,11 @@
         "nixpkgs": "nixpkgs_5"
       },
       "locked": {
-        "lastModified": 1756013439,
-        "narHash": "sha256-vT73pTZ+FRjcsec22jlJsO1gXol0kirk0j+XsNrWJUE=",
+        "lastModified": 1760310813,
+        "narHash": "sha256-POGDmY1f90JbqB9/JEX49SvgudMMVk8LnLESXXzEU1M=",
         "owner": "RoyDumblauskas",
         "repo": "tests-service",
-        "rev": "42986c2b020893688cec4c54d12a966be3792a32",
+        "rev": "62926ee78711ab372e16c854937de38afe8aa742",
         "type": "github"
       },
       "original": {