From e35b42d1f4b97a6e821ac53ee4a7d683722f747d Mon Sep 17 00:00:00 2001
From: Horus <horus@openclaw>
Date: Fri, 10 Apr 2026 13:40:05 +0200
Subject: [PATCH] sync-horus 2026-04-10 13:40

---
 sync-cleo.sh |  8 --------
 sync.sh      | 11 +----------
 2 files changed, 1 insertion(+), 18 deletions(-)
 delete mode 100755 sync-cleo.sh

diff --git a/sync-cleo.sh b/sync-cleo.sh
deleted file mode 100755
index 1aa109d..0000000
--- a/sync-cleo.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-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-cleo $(date '+%Y-%m-%d %H:%M')" >/dev/null 2>&1
-    git push origin main >/dev/null 2>&1
-fi
diff --git a/sync.sh b/sync.sh
index 2fec872..79b1760 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 commit -m "sync-horus $(date '+%Y-%m-%d %H:%M')" >/dev/null 2>&1
     git push origin main >/dev/null 2>&1
 fi