Autocommit in repo: ros.vados.ru, generated by owner: root, in 03:10:56 12.03.2026.

diff --git a/bin/check_repo.sh b/bin/check_repo.sh
index 2f6072817581846c6bb2574bcb89c472c7a4eaea..088e137b97d5b9419d4600eb3cbe591651298439 100755 (executable)
--- a/bin/check_repo.sh
+++ b/bin/check_repo.sh
@@ -6,7 +6,7 @@ dirty="$(git ls-files -u || true)"
 lsfiles="$(git ls-files --others --exclude-standard || true)"
 
 # Conflict or unresolved state: stop and notify.
-if [[ -n "$dirty" ]] || git diff --check --quiet; then
+if [[ -n "$dirty" ]]; then
     echo "[check_repo] repo has conflicts, stop"
     bash bin/notify_telegram.sh "STOP: repo conflicts in $(pwd)"
     exit 1

diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc
index b8f1ab7c866c92f77fc3ae7dc605476f0a8e147a..a03728e8c19d0c243b0e26ef3cc03a68869ad6e9 100644 (file)
--- 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/147/46017c6f";
+:global CommitId "main/148/88fb8eb0";
 :global CommitTAG "unknown";
-:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 03:08:05 12.03.2026.";
+:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 03:10:57 12.03.2026.";
 
 # The variables are received right here.
 :global GlobalConfVersion 138;