still trying to resolve merge conflict

2024-10-12 12:02:36 -04:00
parent df75f0bb24
commit 0dd840f25e
51 changed files with 969 additions and 77 deletions
--- a/glasshouse-desktop/home/scripts/scripts/nixcommit.sh
+++ b/glasshouse-desktop/home/scripts/scripts/nixcommit.sh
@@ -18,7 +18,7 @@ if [ -n "$diffcheck" ]; then
 	exit
 fi
 git add .
-git commit -m "(Desktop) Gen $gen: $1"
+git commit -m "Gen $gen: $1"
 git push
 scheck && runbg aplay ~/media/sound/sys/gitpush.wav
 builtin cd - || exit