From d17aef0878b4500960579ba2f37d8911a4264bb5 Mon Sep 17 00:00:00 2001
From: svkalinin <svkalinin@samsonpost.ru>
Date: Fri, 17 May 2024 10:46:08 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=BE=D1=81=D1=82=D0=B0=D1=82=D0=BA=D0=B8=20=D1=81?=
 =?UTF-8?q?=D0=BB=D0=B8=D1=8F=D0=BD=D0=B8=D1=8F=20=D0=B2=D0=B5=D1=82=D0=BE?=
 =?UTF-8?q?=D0=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 projman.tcl | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/projman.tcl b/projman.tcl
index 114b27b..4b1910d 100755
--- a/projman.tcl
+++ b/projman.tcl
@@ -10,11 +10,7 @@ exec wish "$0" -- "$@"
 ######################################################
 # Version: 2.0.0
 # Release: alpha
-<<<<<<< HEAD
-# Build: 17052024103352
-=======
-# Build: 30072023112719
->>>>>>> 72abc2b84fd6c3356483d080873246f025340b20
+# Build: 17052024104440
 ######################################################
 
 # определим текущую версию, релиз и т.д.