From 7958675dbf85ca6334f64486504226fa74571930 Mon Sep 17 00:00:00 2001
From: Chris Norton <chnorton@fontis.com.au>
Date: Fri, 13 Oct 2023 10:58:50 +1100
Subject: [PATCH] Remove git conflict markers from workflow

---
 .github/workflows/build.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6ec28ac..eb2ac9d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -57,8 +57,6 @@ jobs:
           - 14.3.0
           - 14.2.0
           - 14.1.0
-<<<<<<< Updated upstream
-=======
           - 13.14.0
           - 13.13.0
           - 13.12.0
@@ -76,7 +74,6 @@ jobs:
           - 13.1.0
           - 13.0.1
           - 13.0.0
->>>>>>> Stashed changes
     steps:
       - name: Setup nix features
         run: echo "experimental-features = nix-command flakes ca-references" > /etc/nix/nix.conf