sync-amun 2026-04-10 11:18

2026-04-10 11:18:28 +00:00
parent fecccc25b0 f3c5fd7c22
commit 76a7dae94c
6 changed files with 123 additions and 0 deletions
@@ -1,8 +1,17 @@
 #!/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