From 1c0cf5f0392b13a373762efe32d1497f18068a9b Mon Sep 17 00:00:00 2001
From: Matthias <matthias.mitscherlich@gmail.com>
Date: Sun, 25 Aug 2024 22:03:18 +0200
Subject: [PATCH] Added frigate and homeassistant

---
 homenetwork/swarm/start.sh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/homenetwork/swarm/start.sh b/homenetwork/swarm/start.sh
index 19cda51..1a62a81 100755
--- a/homenetwork/swarm/start.sh
+++ b/homenetwork/swarm/start.sh
@@ -1,6 +1,2 @@
-<<<<<<< HEAD
 docker stack deploy -c portainer-agent-stack.yml portainer
 docker stack deploy -c grafana.yml --with-registry-auth grafana
-=======
-docker stack deploy -c grafana.yml --with-registry-auth swarm
->>>>>>> c1168759d5f8fa78ce3d46865fda84673dfdb115