fix: resolved a committed merge conflict in setup script

Danura30082 · Danura30082 · commit 091eeafe19c4 · 2025-11-04T20:23:44.000+01:00
diff --git a/scripts/setup.sh b/scripts/setup.sh
@@ -25,7 +25,3 @@ uv sync
 # Add the cron job to run the script at reboot
 (crontab -l 2>/dev/null; echo "@reboot /home/intech/CoVAPSy/scripts/startup.sh") | crontab -
 
-=======
-
-
->>>>>>> origin/oled_annimation:Utils/setup.sh
