From a6fb488c35e008c6cdd55ff4a1bd0affd5bcbdd2 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 27 Jun 2024 18:53:39 +0000
Subject: [PATCH] CI(deps): Pin dependencies (#3932)

---
 .github/workflows/test-nix.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/test-nix.yml b/.github/workflows/test-nix.yml
index e2ca63ae453..13a2cdc6b8f 100644
--- a/.github/workflows/test-nix.yml
+++ b/.github/workflows/test-nix.yml
@@ -25,6 +25,7 @@ jobs:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
       - name: Install nix
+<<<<<<< HEAD
 <<<<<<< HEAD
         uses: DeterminateSystems/nix-installer-action@7993355175c2765e5733dae74f3e0786fe0e5c4f # v12
 
@@ -36,6 +37,12 @@ jobs:
       - name: Setup cachix
         uses: cachix/cachix-action@v15
 >>>>>>> 3986103fdf (CI: add nix package build test (#3906))
+=======
+        uses: DeterminateSystems/nix-installer-action@7993355175c2765e5733dae74f3e0786fe0e5c4f # v12
+
+      - name: Setup cachix
+        uses: cachix/cachix-action@ad2ddac53f961de1989924296a1f236fcfbaa4fc # v15
+>>>>>>> ab79e435cc (CI(deps): Pin dependencies (#3932))
         with:
           name: osgeo-grass
           authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'