From 1d2d05cfdfb39b864910c1c5b473648cb05d4c92 Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Tue, 9 May 2023 20:24:43 +0300
Subject: [PATCH] Fix merge issues

---
 scripts/version.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/scripts/version.py b/scripts/version.py
index aec480b2e..27772e9c2 100644
--- a/scripts/version.py
+++ b/scripts/version.py
@@ -35,8 +35,6 @@ class GitVersion:
             or "unknown"
         )
 
-        branch_num = self._exec_git("rev-list --count HEAD") or "n/a"
-
         version = (
             os.environ.get("DIST_SUFFIX", None)
             or "unknown"
@@ -58,7 +56,6 @@ class GitVersion:
             return {
                 "GIT_COMMIT": commit,
                 "GIT_BRANCH": branch,
-                "GIT_BRANCH_NUM": branch_num,
                 "FURI_CUSTOM_FLIPPER_NAME": custom_fz_name,
                 "VERSION": version,
                 "BUILD_DIRTY": dirty and 1 or 0,
@@ -67,7 +64,6 @@ class GitVersion:
             return {
                 "GIT_COMMIT": commit,
                 "GIT_BRANCH": branch,
-                "GIT_BRANCH_NUM": branch_num,
                 "VERSION": version,
                 "BUILD_DIRTY": dirty and 1 or 0,
             }