From 36a0c50ff4d3989e24ecf9fff8163530e9671bc6 Mon Sep 17 00:00:00 2001
From: vados-dev <192440777+vados-dev@users.noreply.github.com>
Date: Thu, 12 Mar 2026 03:16:06 +0300
Subject: [PATCH] Autocommit in repo: ros.vados.ru, generated by owner: root,
 in 03:16:02 12.03.2026.

---
 bin/check_repo.sh      | 3 +++
 html/AM-GlobalFunc.rsc | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/bin/check_repo.sh b/bin/check_repo.sh
index 088e137b9..1ecb927dc 100755
--- a/bin/check_repo.sh
+++ b/bin/check_repo.sh
@@ -8,6 +8,9 @@ lsfiles="$(git ls-files --others --exclude-standard || true)"
 # Conflict or unresolved state: stop and notify.
 if [[ -n "$dirty" ]]; then
     echo "[check_repo] repo has conflicts, stop"
+    echo "[check_repo] unmerged files:"
+    printf "%s\n" "$dirty"
+    echo "[check_repo] resolve conflicts and run: git add <files> && git commit"
     bash bin/notify_telegram.sh "STOP: repo conflicts in $(pwd)"
     exit 1
 fi
diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc
index a03728e8c..c733a6ff5 100644
--- a/html/AM-GlobalFunc.rsc
+++ b/html/AM-GlobalFunc.rsc
@@ -16,9 +16,9 @@
 :global GlobalFuncReady false;
 
 # Git commit id & info, expected configuration version
-:global CommitId "main/148/88fb8eb0";
+:global CommitId "main/149/55914108";
 :global CommitTAG "unknown";
-:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 03:10:57 12.03.2026.";
+:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 03:16:05 12.03.2026.";
 
 # The variables are received right here.
 :global GlobalConfVersion 138;
-- 
2.52.0