sync-amun 2026-04-10 11:42

2026-04-10 11:42:04 +00:00
parent 76a7dae94c
commit 99ccf43a46
1 changed files with 0 additions and 9 deletions
@@ -1,17 +1,8 @@
 #!/bin/bash
-<<<<<<< HEAD
 cd /root/.openclaw/workspace/obsidian-vault
 git pull origin main >/dev/null 2>&1
 if [ -n "$(git status --porcelain)" ]; then
    git add -A
    git commit -m "sync-amun $(date '+%Y-%m-%d %H:%M')" >/dev/null 2>&1
-=======
-VAULT="/root/.openclaw/workspace/obsidian-vault"
-cd "$VAULT"
-git pull origin main >/dev/null 2>&1
-if [ -n "$(git status --porcelain)" ]; then
-    git add -A
-    git commit -m "sync $(date '+%Y-%m-%d %H:%M')" >/dev/null 2>&1
->>>>>>> f3c5fd7c22fd522172d869eab933e902bcc625be
    git push origin main >/dev/null 2>&1
 fi