Merge branch 'main' of https://github.com/TimInTech/Pi-hole-Unbound-PiAlert-Setup

Author: TimInTech

.github/workflows/ci.yml

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 name: ci
 
 on:
@@ -7,6 +6,8 @@ on:
   pull_request:
     branches: [ main ]
 
+
+
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
@@ -98,7 +99,3 @@ jobs:
             echo "❌ Installer script is not executable"
             exit 1
           fi
-=======
-
-
->>>>>>> origin/main