From 99ccf43a469f479ed197eb77ec0ed78a67bd2bd3 Mon Sep 17 00:00:00 2001
From: amun <agent@openclaw>
Date: Fri, 10 Apr 2026 11:42:04 +0000
Subject: [PATCH] sync-amun 2026-04-10 11:42

---
 sync.sh | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/sync.sh b/sync.sh
index 2fec872..0db8584 100755
--- a/sync.sh
+++ b/sync.sh
@@ -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