sync-amun 2026-04-10 11:43

2026-04-10 11:43:37 +00:00
parent 99ccf43a46 e35b42d1f4
commit d78d462999
3 changed files with 34 additions and 8 deletions
@@ -3,6 +3,10 @@ cd /root/.openclaw/workspace/obsidian-vault
 git pull origin main >/dev/null 2>&1
 if [ -n "$(git status --porcelain)" ]; then
    git add -A
+<<<<<<< HEAD
    git commit -m "sync-amun $(date '+%Y-%m-%d %H:%M')" >/dev/null 2>&1
+=======
+    git commit -m "sync-horus $(date '+%Y-%m-%d %H:%M')" >/dev/null 2>&1
+>>>>>>> e35b42d1f4b97a6e821ac53ee4a7d683722f747d
    git push origin main >/dev/null 2>&1
 fi